commit 2b5c9726f4a7d24497fc1df17c6ce57188c99cab
author Tadashi G. Takaoka <takaoka@google.com> Thu May 09 13:14:18 2013 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Fri May 10 15:30:53 2013 +0900
tree 85ed8c492a8303225c44b290eb45dbb7cb778fe9
parent 5ffa5bf3ba7d169912d163790e461ab8d5aca30a

Introduce another activity to launch setup wizard

Bug: 8336068
Change-Id: I35b94dd87c5b01d3e927da8f918a5398dd565d33

java/AndroidManifest.xml

diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index e39ca18..fb973f3 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -57,14 +57,22 @@
         <activity android:name=".setup.SetupActivity"
                 android:label="@string/english_ime_name"
                 android:icon="@mipmap/ic_launcher_keyboard"
-                android:launchMode="singleTop"
-                android:clearTaskOnLaunch="true">
+                android:launchMode="singleTask"
+                android:noHistory="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
+        <activity android:name=".setup.SetupWizardActivity"
+                android:label="@string/english_ime_name"
+                android:clearTaskOnLaunch="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
         <receiver android:name=".setup.LauncherIconVisibilityManager">
             <intent-filter>
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />