You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2012/07/27 22:31:42 UTC
android commit: Tweaking the Android Manfest to cope with new target
changes: CB-1147
Updated Branches:
refs/heads/master 893ecec55 -> f2afa4dd5
Tweaking the Android Manfest to cope with new target changes: CB-1147
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/f2afa4dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/f2afa4dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/f2afa4dd
Branch: refs/heads/master
Commit: f2afa4dd5093e3a9def488c15a3e3bff6ee50c5a
Parents: 893ecec
Author: Joe Bowser <bo...@apache.org>
Authored: Fri Jul 27 13:31:25 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri Jul 27 13:31:25 2012 -0700
----------------------------------------------------------------------
bin/templates/project/AndroidManifest.xml | 6 +++---
framework/AndroidManifest.xml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/f2afa4dd/bin/templates/project/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/AndroidManifest.xml b/bin/templates/project/AndroidManifest.xml
index 0cff488..9e9abcd 100644
--- a/bin/templates/project/AndroidManifest.xml
+++ b/bin/templates/project/AndroidManifest.xml
@@ -48,8 +48,8 @@
<application android:icon="@drawable/icon" android:label="@string/app_name"
android:debuggable="true">
- <activity android:name="__ACTIVITY__" android:label="@string/app_name"
- android:configChanges="orientation|keyboardHidden">
+ <activity android:name="__ACTIVITY__" android:label="@string/app_name"
+ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
@@ -57,5 +57,5 @@
</activity>
</application>
- <uses-sdk android:minSdkVersion="5" />
+ <uses-sdk android:minSdkVersion="8" />
</manifest>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/f2afa4dd/framework/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/framework/AndroidManifest.xml b/framework/AndroidManifest.xml
index a267683..92f66f4 100755
--- a/framework/AndroidManifest.xml
+++ b/framework/AndroidManifest.xml
@@ -51,7 +51,7 @@
<application android:icon="@drawable/icon" android:label="@string/app_name"
android:debuggable="true">
<activity android:name=".StandAlone" android:windowSoftInputMode="adjustPan"
- android:label="@string/app_name" android:configChanges="orientation|keyboardHidden">
+ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />