From 80279cbf214a6a0760b92a5fcc2c4bc6be971c5f Mon Sep 17 00:00:00 2001 From: leda Date: Tue, 4 Sep 2018 13:57:44 +0800 Subject: [PATCH] mark cocos2dx activity as "singleTask" (#19010) --- .../cpp-template-default/proj.android/app/AndroidManifest.xml | 4 +++- .../runtime-src/proj.android/app/AndroidManifest.xml | 4 +++- .../runtime-src/proj.android/app/AndroidManifest.xml | 4 +++- tests/cpp-empty-test/proj.android/app/AndroidManifest.xml | 4 +++- tests/cpp-tests/proj.android/app/AndroidManifest.xml | 4 +++- tests/js-tests/project/proj.android/app/AndroidManifest.xml | 4 +++- .../project/proj.android/app/AndroidManifest.xml | 4 +++- .../project/proj.android/app/AndroidManifest.xml | 4 +++- tests/lua-tests/project/proj.android/app/AndroidManifest.xml | 4 +++- 9 files changed, 27 insertions(+), 9 deletions(-) diff --git a/templates/cpp-template-default/proj.android/app/AndroidManifest.xml b/templates/cpp-template-default/proj.android/app/AndroidManifest.xml index 489eff1254..88d0669f15 100644 --- a/templates/cpp-template-default/proj.android/app/AndroidManifest.xml +++ b/templates/cpp-template-default/proj.android/app/AndroidManifest.xml @@ -21,7 +21,9 @@ android:screenOrientation="landscape" android:configChanges="orientation|keyboardHidden|screenSize" android:label="@string/app_name" - android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + android:launchMode="singleTask" + android:taskAffinity="" > diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android/app/AndroidManifest.xml b/templates/js-template-default/frameworks/runtime-src/proj.android/app/AndroidManifest.xml index 7c53b4d93c..d47662adf0 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.android/app/AndroidManifest.xml +++ b/templates/js-template-default/frameworks/runtime-src/proj.android/app/AndroidManifest.xml @@ -19,7 +19,9 @@ android:screenOrientation="landscape" android:configChanges="orientation|keyboardHidden|screenSize" android:label="@string/app_name" - android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + android:launchMode="singleTask" + android:taskAffinity="" > diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/app/AndroidManifest.xml b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/AndroidManifest.xml index 86fd1b77dc..8bcb400f79 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.android/app/AndroidManifest.xml +++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/AndroidManifest.xml @@ -19,7 +19,9 @@ android:screenOrientation="landscape" android:configChanges="orientation|keyboardHidden|screenSize" android:label="@string/app_name" - android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + android:launchMode="singleTask" + android:taskAffinity="" > diff --git a/tests/cpp-empty-test/proj.android/app/AndroidManifest.xml b/tests/cpp-empty-test/proj.android/app/AndroidManifest.xml index 61e5799c0a..a6e5fd1799 100644 --- a/tests/cpp-empty-test/proj.android/app/AndroidManifest.xml +++ b/tests/cpp-empty-test/proj.android/app/AndroidManifest.xml @@ -19,7 +19,9 @@ android:screenOrientation="landscape" android:configChanges="orientation|keyboardHidden|screenSize" android:label="@string/app_name" - android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + android:launchMode="singleTask" + android:taskAffinity="" > diff --git a/tests/cpp-tests/proj.android/app/AndroidManifest.xml b/tests/cpp-tests/proj.android/app/AndroidManifest.xml index 5286307eeb..c7d83e5572 100644 --- a/tests/cpp-tests/proj.android/app/AndroidManifest.xml +++ b/tests/cpp-tests/proj.android/app/AndroidManifest.xml @@ -21,7 +21,9 @@ android:screenOrientation="landscape" android:configChanges="orientation|keyboardHidden|screenSize" android:label="@string/app_name" - android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + android:launchMode="singleTask" + android:taskAffinity="" > diff --git a/tests/js-tests/project/proj.android/app/AndroidManifest.xml b/tests/js-tests/project/proj.android/app/AndroidManifest.xml index 05f9386b5d..2e52099d32 100644 --- a/tests/js-tests/project/proj.android/app/AndroidManifest.xml +++ b/tests/js-tests/project/proj.android/app/AndroidManifest.xml @@ -27,7 +27,9 @@ android:screenOrientation="landscape" android:configChanges="orientation|keyboardHidden|screenSize" android:label="@string/app_name" - android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + android:launchMode="singleTask" + android:taskAffinity="" > diff --git a/tests/lua-empty-test/project/proj.android/app/AndroidManifest.xml b/tests/lua-empty-test/project/proj.android/app/AndroidManifest.xml index e6576946d0..dd64c3d7bf 100644 --- a/tests/lua-empty-test/project/proj.android/app/AndroidManifest.xml +++ b/tests/lua-empty-test/project/proj.android/app/AndroidManifest.xml @@ -20,7 +20,9 @@ android:screenOrientation="landscape" android:configChanges="orientation|keyboardHidden|screenSize" android:label="@string/app_name" - android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + android:launchMode="singleTask" + android:taskAffinity="" > diff --git a/tests/lua-game-controller-test/project/proj.android/app/AndroidManifest.xml b/tests/lua-game-controller-test/project/proj.android/app/AndroidManifest.xml index 2d05294b20..197f5e9a3f 100644 --- a/tests/lua-game-controller-test/project/proj.android/app/AndroidManifest.xml +++ b/tests/lua-game-controller-test/project/proj.android/app/AndroidManifest.xml @@ -24,7 +24,9 @@ android:screenOrientation="landscape" android:configChanges="orientation|keyboardHidden|screenSize" android:label="@string/app_name" - android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + android:launchMode="singleTask" + android:taskAffinity="" > diff --git a/tests/lua-tests/project/proj.android/app/AndroidManifest.xml b/tests/lua-tests/project/proj.android/app/AndroidManifest.xml index 0caa6cc2a6..16f6cdb54b 100644 --- a/tests/lua-tests/project/proj.android/app/AndroidManifest.xml +++ b/tests/lua-tests/project/proj.android/app/AndroidManifest.xml @@ -21,7 +21,9 @@ android:screenOrientation="landscape" android:configChanges="orientation|keyboardHidden|screenSize" android:label="@string/app_name" - android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + android:launchMode="singleTask" + android:taskAffinity="" >