From dfd9182b15a6844a75e21a75b25db343648545de Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 3 Dec 2013 12:34:08 +0900
Subject: [PATCH] Move launcher icon from mipmap to drawable

Bug: 11106827
Change-Id: I45e64759ce095669be557957fa27eb7f9933e188
---
 java/AndroidManifest.xml                            |   4 ++--
 .../ic_launcher_keyboard.png                        | Bin
 .../ic_launcher_keyboard.png                        | Bin
 .../ic_launcher_keyboard.png                        | Bin
 .../ic_launcher_keyboard.png                        | Bin
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename java/res/{mipmap-hdpi => drawable-hdpi}/ic_launcher_keyboard.png (100%)
 rename java/res/{mipmap-mdpi => drawable-mdpi}/ic_launcher_keyboard.png (100%)
 rename java/res/{mipmap-xhdpi => drawable-xhdpi}/ic_launcher_keyboard.png (100%)
 rename java/res/{mipmap-xxhdpi => drawable-xxhdpi}/ic_launcher_keyboard.png (100%)

diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index a8dabd274..0d80c037b 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
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
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
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