diff options
Diffstat (limited to 'java/AndroidManifest.xml')
| -rw-r--r-- | java/AndroidManifest.xml | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml index 4a8b95516..fb973f336 100644 --- a/java/AndroidManifest.xml +++ b/java/AndroidManifest.xml @@ -32,7 +32,7 @@ <uses-permission android:name="android.permission.WRITE_USER_DICTIONARY" /> <application android:label="@string/english_ime_name" - android:icon="@mipmap/ic_ime_settings" + android:icon="@mipmap/ic_launcher_keyboard" android:killAfterRestore="false" android:supportsRtl="true"> @@ -56,13 +56,23 @@ <activity android:name=".setup.SetupActivity" android:label="@string/english_ime_name" - android:icon="@drawable/ic_setup_wizard"> + android:icon="@mipmap/ic_launcher_keyboard" + 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" /> @@ -125,7 +135,6 @@ <activity android:name="com.android.inputmethod.dictionarypack.DictionarySettingsActivity" android:label="@string/dictionary_settings_title" - android:icon="@mipmap/ic_ime_settings" android:theme="@android:style/Theme.Holo" android:uiOptions="splitActionBarWhenNarrow"> <intent-filter> @@ -135,7 +144,6 @@ <activity android:name="com.android.inputmethod.dictionarypack.DownloadOverMeteredDialog" android:label="@string/dictionary_install_over_metered_network_prompt" - android:icon="@mipmap/ic_ime_settings" android:theme="@android:style/Theme.Holo"> <intent-filter> <action android:name="android.intent.action.MAIN"/> |