| commit | b6764c51ab6acc8b5acf3ce3513e30c9ce82d02c | [log] [tgz] |
|---|---|---|
| author | Keisuke Kuroyanagi <ksk@google.com> | Tue Dec 03 06:28:44 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Dec 03 06:28:44 2013 +0000 |
| tree | fc5e2c7438a946573d8b7ace32b5bbe09e4843b4 | |
| parent | dfd9182b15a6844a75e21a75b25db343648545de [diff] | |
| parent | b4aea1acaa3f357f7dd07f739d7f9788296932a2 [diff] |
Merge "Fix: terminal lookup table flushing."
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml index a8dabd2..0d80c03 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_launcher_keyboard" + android:icon="@drawable/ic_launcher_keyboard" android:killAfterRestore="false" android:supportsRtl="true"> @@ -57,7 +57,7 @@ <activity android:name=".setup.SetupActivity" android:label="@string/english_ime_name" - android:icon="@mipmap/ic_launcher_keyboard" + android:icon="@drawable/ic_launcher_keyboard" android:launchMode="singleTask" android:noHistory="true"> <intent-filter>
diff --git a/java/res/mipmap-hdpi/ic_launcher_keyboard.png b/java/res/drawable-hdpi/ic_launcher_keyboard.png similarity index 100% rename from java/res/mipmap-hdpi/ic_launcher_keyboard.png rename to java/res/drawable-hdpi/ic_launcher_keyboard.png Binary files differ
diff --git a/java/res/mipmap-mdpi/ic_launcher_keyboard.png b/java/res/drawable-mdpi/ic_launcher_keyboard.png similarity index 100% rename from java/res/mipmap-mdpi/ic_launcher_keyboard.png rename to java/res/drawable-mdpi/ic_launcher_keyboard.png Binary files differ
diff --git a/java/res/mipmap-xhdpi/ic_launcher_keyboard.png b/java/res/drawable-xhdpi/ic_launcher_keyboard.png similarity index 100% rename from java/res/mipmap-xhdpi/ic_launcher_keyboard.png rename to java/res/drawable-xhdpi/ic_launcher_keyboard.png Binary files differ
diff --git a/java/res/mipmap-xxhdpi/ic_launcher_keyboard.png b/java/res/drawable-xxhdpi/ic_launcher_keyboard.png similarity index 100% rename from java/res/mipmap-xxhdpi/ic_launcher_keyboard.png rename to java/res/drawable-xxhdpi/ic_launcher_keyboard.png Binary files differ
