cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject android commit: CB-4404: Changing where android:windowSoftInputMode is in the manifest so it works
Date Thu, 12 Jun 2014 18:47:52 GMT
Repository: cordova-android
Updated Branches:
  refs/heads/master 483babe3b -> 663a919ed


CB-4404: Changing where android:windowSoftInputMode is in the manifest so it works


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/663a919e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/663a919e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/663a919e

Branch: refs/heads/master
Commit: 663a919ed1eb5e24c22e7ee6b0e74a29ff76345c
Parents: 483babe
Author: Joe Bowser <bowserj@apache.org>
Authored: Thu Jun 12 11:47:41 2014 -0700
Committer: Joe Bowser <bowserj@apache.org>
Committed: Thu Jun 12 11:47:41 2014 -0700

----------------------------------------------------------------------
 bin/templates/project/AndroidManifest.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/663a919e/bin/templates/project/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/AndroidManifest.xml b/bin/templates/project/AndroidManifest.xml
index 315a4dd..5336be3 100644
--- a/bin/templates/project/AndroidManifest.xml
+++ b/bin/templates/project/AndroidManifest.xml
@@ -17,8 +17,8 @@
        specific language governing permissions and limitations
        under the License.
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:windowSoftInputMode="adjustPan"
-      package="__PACKAGE__" android:versionName="1.0" android:versionCode="1" android:hardwareAccelerated="true">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" 
+  package="__PACKAGE__" android:versionName="1.0" android:versionCode="1" android:hardwareAccelerated="true">
     <supports-screens
         android:largeScreens="true"
         android:normalScreens="true"
@@ -36,6 +36,7 @@
                 android:label="@string/activity_name"
                 android:launchMode="singleTop"
                 android:theme="@android:style/Theme.Black.NoTitleBar"
+                android:windowSoftInputMode="adjustPan"
                 android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale">
             <intent-filter android:label="@string/launcher_name">
                 <action android:name="android.intent.action.MAIN" />


Mime
View raw message