Merge pull request #14137 from pandamicro/androidbug

Fix Android activity destroyed after reopen the app
2015-10-14 11:46:27 +08:00 · 2015-10-14 11:46:27 +08:00 · e02ba57144
parent aa84c064b4 ec2aa7e8f2
commit e02ba57144
2 changed files with 2 additions and 2 deletions
--- a/templates/cpp-template-default/proj.android/AndroidManifest.xml
+++ b/templates/cpp-template-default/proj.android/AndroidManifest.xml
@ -19,7 +19,7 @@
                  android:label="@string/app_name"
                  android:screenOrientation="landscape"
                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:configChanges="orientation">
+                  android:configChanges="orientation|keyboardHidden|screenSize">

            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
--- a/templates/cpp-template-default/proj.android/project.properties
+++ b/templates/cpp-template-default/proj.android/project.properties
@ -8,6 +8,6 @@
 # project structure.

 # Project target.
-target=android-10
+target=android-15

 android.library.reference.1=../cocos2d/cocos/platform/android/java