am e64e3a71: am f8ddd13b: Removed subtype icon for each country and added subtype icon for each mode

* commit 'e64e3a71ffe08f2d54ff4408945f3aacbc1a192c':
  Removed subtype icon for each country and added subtype icon for each mode

java/res/xml/method.xml

@@ -29,195 +29,195 @@
 <input-method xmlns:android="http://schemas.android.com/apk/res/android"
         android:settingsActivity="com.android.inputmethod.latin.Settings"
         android:isDefault="@bool/im_is_default">
-    <subtype android:icon="@drawable/ic_subtype_keyboard_en_gb"
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_mode_en_US_keyboard"
             android:imeSubtypeLocale="en_US"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic_en_us"
+    <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_en_US_voice"
             android:imeSubtypeLocale="en_US"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard_cs"
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_mode_cs_keyboard"
             android:imeSubtypeLocale="cs"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic_cs"
+    <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_cs_voice"
             android:imeSubtypeLocale="cs"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard_da"
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_mode_da_keyboard"
             android:imeSubtypeLocale="da"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard_de"
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_mode_de_keyboard"
             android:imeSubtypeLocale="de"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic_de"
+    <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_de_voice"
             android:imeSubtypeLocale="de"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard_en_gb"
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_mode_en_GB_keyboard"
             android:imeSubtypeLocale="en_GB"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic_en_gb"
+    <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_en_GB_voice"
             android:imeSubtypeLocale="en_GB"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic_en_au"
+    <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_en_AU_voice"
             android:imeSubtypeLocale="en_AU"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic_en_in"
+    <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_en_IN_voice"
             android:imeSubtypeLocale="en_IN"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic_en_nz"
+    <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_en_NZ_voice"
             android:imeSubtypeLocale="en_NZ"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard_es"
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_mode_es_keyboard"
             android:imeSubtypeLocale="es"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic_es"
+    <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_es_voice"
             android:imeSubtypeLocale="es"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard_es_us"
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_mode_es_US_keyboard"
             android:imeSubtypeLocale="es_US"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard_fr"
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_mode_fr_keyboard"
             android:imeSubtypeLocale="fr"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic_fr"
+    <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_fr_voice"
             android:imeSubtypeLocale="fr"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard_fr_ca"
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_mode_fr_CA_keyboard"
             android:imeSubtypeLocale="fr_CA"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard_fr_ch"
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_mode_fr_CH_keyboard"
             android:imeSubtypeLocale="fr_CH"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard_it"
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_mode_it_keyboard"
             android:imeSubtypeLocale="it"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic_it"
+    <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_it_voice"
             android:imeSubtypeLocale="it"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard_nb"
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_mode_nb_keyboard"
             android:imeSubtypeLocale="nb"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard_nl"
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_mode_nl_keyboard"
             android:imeSubtypeLocale="nl"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic_nl"
+    <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_nl_voice"
             android:imeSubtypeLocale="nl"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard_ru"
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_mode_ru_keyboard"
             android:imeSubtypeLocale="ru"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard_sr"
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_mode_sr_keyboard"
             android:imeSubtypeLocale="sr"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard_sv"
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_mode_sv_keyboard"
             android:imeSubtypeLocale="sv"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic_ko"
+    <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_ko_voice"
             android:imeSubtypeLocale="ko"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic_ja"
+    <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_ja_voice"
             android:imeSubtypeLocale="ja"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic_pl"
+    <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_pl_voice"
             android:imeSubtypeLocale="pl"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic_pt"
+    <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_pt_voice"
             android:imeSubtypeLocale="pt"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic_ru"
+    <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_ru_voice"
             android:imeSubtypeLocale="ru"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic_tr"
+    <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_tr_voice"
             android:imeSubtypeLocale="tr"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic_zh_cn"
+    <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_zh_CN_voice"
             android:imeSubtypeLocale="zh_CN"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic_zh_tw"
+    <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_zh_TW_voice"
             android:imeSubtypeLocale="zh_TW"
             android:imeSubtypeMode="voice"