Change the order of subtypes list
Change-Id: I748ed8e8a280832c1e3170ed070c2ae22ee7d5c1
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index aabc958..4e410a3 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -21,24 +21,34 @@
<!-- for the Input Method Manager. -->
<!-- Keyboard: en_US, cs, da, de, en_GB, es, es_US, fr, fr_CA, fr_CH, it, nb, nl, sr, sv -->
-<!-- Voice: cs, da, de, en_AU, en_GB, en_IN, en_NZ, en_US, es, fr, ko, ja, pl, pt, ru, tr, zh_CN, zh_TW -->
+<!-- Voice: cs, da, de, en_AU, en_GB, en_IN, en_NZ, en_US, es, fr, it, ko, nl, ja, pl, pt, ru, tr, zh_CN, zh_TW -->
<!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. -->
<!-- TODO: use <lang>_mic icon instead of a common mic icon. -->
+<!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default
+ subtype.-->
<input-method xmlns:android="http://schemas.android.com/apk/res/android"
android:settingsActivity="com.android.inputmethod.latin.Settings"
android:isDefault="@bool/im_is_default">
- <!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default
- subtype.-->
<subtype android:icon="@drawable/ic_subtype_keyboard_en_gb"
android:label="@string/subtype_mode_en_US_keyboard"
android:imeSubtypeLocale="en_US"
android:imeSubtypeMode="keyboard"
/>
+ <subtype android:icon="@drawable/ic_subtype_mic_en_us"
+ android:label="@string/subtype_mode_en_US_voice"
+ android:imeSubtypeLocale="en_US"
+ android:imeSubtypeMode="voice"
+ />
<subtype android:icon="@drawable/ic_subtype_keyboard_cs"
android:label="@string/subtype_mode_cs_keyboard"
android:imeSubtypeLocale="cs"
android:imeSubtypeMode="keyboard"
/>
+ <subtype android:icon="@drawable/ic_subtype_mic_cs"
+ android:label="@string/subtype_mode_cs_voice"
+ android:imeSubtypeLocale="cs"
+ android:imeSubtypeMode="voice"
+ />
<subtype android:icon="@drawable/ic_subtype_keyboard_da"
android:label="@string/subtype_mode_da_keyboard"
android:imeSubtypeLocale="da"
@@ -49,16 +59,46 @@
android:imeSubtypeLocale="de"
android:imeSubtypeMode="keyboard"
/>
+ <subtype android:icon="@drawable/ic_subtype_mic_de"
+ android:label="@string/subtype_mode_de_voice"
+ android:imeSubtypeLocale="de"
+ android:imeSubtypeMode="voice"
+ />
<subtype android:icon="@drawable/ic_subtype_keyboard_en_gb"
android:label="@string/subtype_mode_en_GB_keyboard"
android:imeSubtypeLocale="en_GB"
android:imeSubtypeMode="keyboard"
/>
+ <subtype android:icon="@drawable/ic_subtype_mic_en_gb"
+ android:label="@string/subtype_mode_en_GB_voice"
+ android:imeSubtypeLocale="en_GB"
+ android:imeSubtypeMode="voice"
+ />
+ <subtype android:icon="@drawable/ic_subtype_mic_en_au"
+ android:label="@string/subtype_mode_en_AU_voice"
+ android:imeSubtypeLocale="en_AU"
+ android:imeSubtypeMode="voice"
+ />
+ <subtype android:icon="@drawable/ic_subtype_mic_en_in"
+ android:label="@string/subtype_mode_en_IN_voice"
+ android:imeSubtypeLocale="en_IN"
+ android:imeSubtypeMode="voice"
+ />
+ <subtype android:icon="@drawable/ic_subtype_mic_en_nz"
+ android:label="@string/subtype_mode_en_NZ_voice"
+ android:imeSubtypeLocale="en_NZ"
+ android:imeSubtypeMode="voice"
+ />
<subtype android:icon="@drawable/ic_subtype_keyboard_es"
android:label="@string/subtype_mode_es_keyboard"
android:imeSubtypeLocale="es"
android:imeSubtypeMode="keyboard"
/>
+ <subtype android:icon="@drawable/ic_subtype_mic_es"
+ android:label="@string/subtype_mode_es_voice"
+ android:imeSubtypeLocale="es"
+ android:imeSubtypeMode="voice"
+ />
<subtype android:icon="@drawable/ic_subtype_keyboard_es_us"
android:label="@string/subtype_mode_es_US_keyboard"
android:imeSubtypeLocale="es_US"
@@ -69,6 +109,11 @@
android:imeSubtypeLocale="fr"
android:imeSubtypeMode="keyboard"
/>
+ <subtype android:icon="@drawable/ic_subtype_mic_fr"
+ android:label="@string/subtype_mode_fr_voice"
+ android:imeSubtypeLocale="fr"
+ android:imeSubtypeMode="voice"
+ />
<subtype android:icon="@drawable/ic_subtype_keyboard_fr_ca"
android:label="@string/subtype_mode_fr_CA_keyboard"
android:imeSubtypeLocale="fr_CA"
@@ -84,6 +129,11 @@
android:imeSubtypeLocale="it"
android:imeSubtypeMode="keyboard"
/>
+ <subtype android:icon="@drawable/ic_subtype_mic_it"
+ android:label="@string/subtype_mode_it_voice"
+ android:imeSubtypeLocale="it"
+ android:imeSubtypeMode="voice"
+ />
<subtype android:icon="@drawable/ic_subtype_keyboard_nb"
android:label="@string/subtype_mode_nb_keyboard"
android:imeSubtypeLocale="nb"
@@ -94,6 +144,11 @@
android:imeSubtypeLocale="nl"
android:imeSubtypeMode="keyboard"
/>
+ <subtype android:icon="@drawable/ic_subtype_mic_nl"
+ android:label="@string/subtype_mode_nl_voice"
+ android:imeSubtypeLocale="nl"
+ android:imeSubtypeMode="voice"
+ />
<subtype android:icon="@drawable/ic_subtype_keyboard_ru"
android:label="@string/subtype_mode_ru_keyboard"
android:imeSubtypeLocale="ru"
@@ -109,56 +164,6 @@
android:imeSubtypeLocale="sv"
android:imeSubtypeMode="keyboard"
/>
- <subtype android:icon="@drawable/ic_subtype_mic_cs"
- android:label="@string/subtype_mode_cs_voice"
- android:imeSubtypeLocale="cs"
- android:imeSubtypeMode="voice"
- />
- <subtype android:icon="@drawable/ic_subtype_mic_de"
- android:label="@string/subtype_mode_de_voice"
- android:imeSubtypeLocale="de"
- android:imeSubtypeMode="voice"
- />
- <subtype android:icon="@drawable/ic_subtype_mic_en_au"
- android:label="@string/subtype_mode_en_AU_voice"
- android:imeSubtypeLocale="en_AU"
- android:imeSubtypeMode="voice"
- />
- <subtype android:icon="@drawable/ic_subtype_mic_en_gb"
- android:label="@string/subtype_mode_en_GB_voice"
- android:imeSubtypeLocale="en_GB"
- android:imeSubtypeMode="voice"
- />
- <subtype android:icon="@drawable/ic_subtype_mic_en_in"
- android:label="@string/subtype_mode_en_IN_voice"
- android:imeSubtypeLocale="en_IN"
- android:imeSubtypeMode="voice"
- />
- <subtype android:icon="@drawable/ic_subtype_mic_en_nz"
- android:label="@string/subtype_mode_en_NZ_voice"
- android:imeSubtypeLocale="en_NZ"
- android:imeSubtypeMode="voice"
- />
- <subtype android:icon="@drawable/ic_subtype_mic_en_us"
- android:label="@string/subtype_mode_en_US_voice"
- android:imeSubtypeLocale="en_US"
- android:imeSubtypeMode="voice"
- />
- <subtype android:icon="@drawable/ic_subtype_mic_es"
- android:label="@string/subtype_mode_es_voice"
- android:imeSubtypeLocale="es"
- android:imeSubtypeMode="voice"
- />
- <subtype android:icon="@drawable/ic_subtype_mic_fr"
- android:label="@string/subtype_mode_fr_voice"
- android:imeSubtypeLocale="fr"
- android:imeSubtypeMode="voice"
- />
- <subtype android:icon="@drawable/ic_subtype_mic_it"
- android:label="@string/subtype_mode_it_voice"
- android:imeSubtypeLocale="it"
- android:imeSubtypeMode="voice"
- />
<subtype android:icon="@drawable/ic_subtype_mic_ko"
android:label="@string/subtype_mode_ko_voice"
android:imeSubtypeLocale="ko"
@@ -169,11 +174,6 @@
android:imeSubtypeLocale="ja"
android:imeSubtypeMode="voice"
/>
- <subtype android:icon="@drawable/ic_subtype_mic_nl"
- android:label="@string/subtype_mode_nl_voice"
- android:imeSubtypeLocale="nl"
- android:imeSubtypeMode="voice"
- />
<subtype android:icon="@drawable/ic_subtype_mic_pl"
android:label="@string/subtype_mode_pl_voice"
android:imeSubtypeLocale="pl"