Tidy up the subtype names
Change-Id: I5dbdc6c006fab01fa389f0796b6c87aa2a90132e
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 7aaf57b..7a4e7ea 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -24,237 +24,132 @@
<!-- Voice: af, cs, da, de, en, es, fr, it, ja, ko, nl, pl, pt, ru, tr, yue, zh, zu -->
<!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. -->
<!-- TODO: use <lang>_mic icon instead of a common mic icon. -->
-<!-- TODO: remove all comment outed voice subtypes -->
<!-- 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">
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_en_US_keyboard"
+ android:label="@string/subtype_en_US"
android:imeSubtypeLocale="en_US"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="TrySuppressingImeSwitcher"
/>
-<!-- <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!-- android:label="@string/subtype_mode_en_voice" -->
-<!-- android:imeSubtypeLocale="en" -->
-<!-- android:imeSubtypeMode="voice" -->
-<!-- android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!-- /> -->
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_en_GB_keyboard"
+ android:label="@string/subtype_en_GB"
android:imeSubtypeLocale="en_GB"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="TrySuppressingImeSwitcher"
/>
- <!-- The file for Arabic layout is an alpha version. It needs to be run through UX. -->
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_ar_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="ar"
android:imeSubtypeMode="keyboard"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_cs_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="cs"
android:imeSubtypeMode="keyboard"
/>
-<!-- <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!-- android:label="@string/subtype_mode_cs_voice" -->
-<!-- android:imeSubtypeLocale="cs" -->
-<!-- android:imeSubtypeMode="voice" -->
-<!-- android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!-- /> -->
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_da_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="da"
android:imeSubtypeMode="keyboard"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_de_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="de"
android:imeSubtypeMode="keyboard"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_de_qwerty_keyboard"
+ android:label="@string/subtype_de_qwerty"
android:imeSubtypeLocale="de_ZZ"
android:imeSubtypeMode="keyboard"
/>
-<!-- <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!-- android:label="@string/subtype_mode_de_voice" -->
-<!-- android:imeSubtypeLocale="de" -->
-<!-- android:imeSubtypeMode="voice" -->
-<!-- android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!-- /> -->
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_es_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="es"
android:imeSubtypeMode="keyboard"
/>
-<!-- <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!-- android:label="@string/subtype_mode_es_voice" -->
-<!-- android:imeSubtypeLocale="es" -->
-<!-- android:imeSubtypeMode="voice" -->
-<!-- android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!-- /> -->
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_fi_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="fi"
android:imeSubtypeMode="keyboard"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_fr_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="fr"
android:imeSubtypeMode="keyboard"
/>
-<!-- <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!-- android:label="@string/subtype_mode_fr_voice" -->
-<!-- android:imeSubtypeLocale="fr" -->
-<!-- android:imeSubtypeMode="voice" -->
-<!-- android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!-- /> -->
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_fr_CA_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="fr_CA"
android:imeSubtypeMode="keyboard"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_fr_CH_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="fr_CH"
android:imeSubtypeMode="keyboard"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_hr_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="hr"
android:imeSubtypeMode="keyboard"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_hu_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="hu"
android:imeSubtypeMode="keyboard"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_it_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="it"
android:imeSubtypeMode="keyboard"
/>
<!-- Java uses the deprecated "iw" code instead of the standard "he" code for Hebrew. -->
- <!-- The file for Hebrew layout is an alpha version. It needs to be run through UX. -->
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_iw_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="iw"
android:imeSubtypeMode="keyboard"
/>
-<!-- <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!-- android:label="@string/subtype_mode_it_voice" -->
-<!-- android:imeSubtypeLocale="it" -->
-<!-- android:imeSubtypeMode="voice" -->
-<!-- android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!-- /> -->
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_nb_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="nb"
android:imeSubtypeMode="keyboard"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_nl_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="nl"
android:imeSubtypeMode="keyboard"
/>
-<!-- <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!-- android:label="@string/subtype_mode_nl_voice" -->
-<!-- android:imeSubtypeLocale="nl" -->
-<!-- android:imeSubtypeMode="voice" -->
-<!-- android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!-- /> -->
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_pl_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="pl"
android:imeSubtypeMode="keyboard"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_pt_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="pt"
android:imeSubtypeMode="keyboard"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_ru_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="ru"
android:imeSubtypeMode="keyboard"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_sr_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="sr"
android:imeSubtypeMode="keyboard"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_sv_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="sv"
android:imeSubtypeMode="keyboard"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_mode_tr_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="tr"
android:imeSubtypeMode="keyboard"
/>
-<!-- <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!-- android:label="@string/subtype_mode_af_voice" -->
-<!-- android:imeSubtypeLocale="af" -->
-<!-- android:imeSubtypeMode="voice" -->
-<!-- android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!-- /> -->
-<!-- <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!-- android:label="@string/subtype_mode_ja_voice" -->
-<!-- android:imeSubtypeLocale="ja" -->
-<!-- android:imeSubtypeMode="voice" -->
-<!-- android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!-- /> -->
-<!-- <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!-- android:label="@string/subtype_mode_ko_voice" -->
-<!-- android:imeSubtypeLocale="ko" -->
-<!-- android:imeSubtypeMode="voice" -->
-<!-- android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!-- /> -->
-<!-- <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!-- android:label="@string/subtype_mode_pl_voice" -->
-<!-- android:imeSubtypeLocale="pl" -->
-<!-- android:imeSubtypeMode="voice" -->
-<!-- android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!-- /> -->
-<!-- <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!-- android:label="@string/subtype_mode_pt_voice" -->
-<!-- android:imeSubtypeLocale="pt" -->
-<!-- android:imeSubtypeMode="voice" -->
-<!-- android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!-- /> -->
-<!-- <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!-- android:label="@string/subtype_mode_ru_voice" -->
-<!-- android:imeSubtypeLocale="ru" -->
-<!-- android:imeSubtypeMode="voice" -->
-<!-- android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!-- /> -->
-<!-- <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!-- android:label="@string/subtype_mode_tr_voice" -->
-<!-- android:imeSubtypeLocale="tr" -->
-<!-- android:imeSubtypeMode="voice" -->
-<!-- android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!-- /> -->
-<!-- <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!-- android:label="@string/subtype_mode_yue_voice" -->
-<!-- android:imeSubtypeLocale="yue" -->
-<!-- android:imeSubtypeMode="voice" -->
-<!-- android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!-- /> -->
-<!-- <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!-- android:label="@string/subtype_mode_zh_voice" -->
-<!-- android:imeSubtypeLocale="zh" -->
-<!-- android:imeSubtypeMode="voice" -->
-<!-- android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!-- /> -->
-<!-- <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!-- android:label="@string/subtype_mode_zu_voice" -->
-<!-- android:imeSubtypeLocale="zu" -->
-<!-- android:imeSubtypeMode="voice" -->
-<!-- android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!-- /> -->
</input-method>