am 146cf238: DO NOT MERGE: Update input method subtype locales.

* commit '146cf238792c4748aa726a440fb96a33b4260fa5':
  DO NOT MERGE: Update input method subtype locales.
This commit is contained in:
Ken Wakasa 2013-10-18 11:18:26 -07:00 committed by Android Git Automerger
commit 069d44c32c

View file

@ -39,7 +39,7 @@
es: Spanish/spanish es: Spanish/spanish
es_US: Spanish United States/spanish es_US: Spanish United States/spanish
(es_419: Spanish Latin America/qwerty) (es_419: Spanish Latin America/qwerty)
et: Estonian/nordic et_EE: Estonian/nordic
fa: Persian/arabic fa: Persian/arabic
fi: Finnish/nordic fi: Finnish/nordic
fr: French/azerty fr: French/azerty
@ -47,21 +47,21 @@
hi: Hindi/hindi hi: Hindi/hindi
hr: Croatian/qwertz hr: Croatian/qwertz
hu: Hungarian/qwertz hu: Hungarian/qwertz
hy: Armenian Phonetic/armenian_phonetic hy_AM: Armenian Phonetic/armenian_phonetic
in: Indonesian/qwerty # "id" is official language code of Indonesian. in: Indonesian/qwerty # "id" is official language code of Indonesian.
is: Icelandic/qwerty is: Icelandic/qwerty
it: Italian/qwerty it: Italian/qwerty
iw: Hebrew/hebrew # "he" is official language code of Hebrew. iw: Hebrew/hebrew # "he" is official language code of Hebrew.
ka: Georgian/georgian ka_GE: Georgian/georgian
(kk: Kazakh/east_slavic) # disabled temporarily. waiting for string resources. (kk: Kazakh/east_slavic) # disabled temporarily. waiting for string resources.
km: Khmer/khmer km_KH: Khmer/khmer
ky: Kyrgyz/east_slavic ky: Kyrgyz/east_slavic
lo: Lao/lao lo_LA: Lao/lao
lt: Lithuanian/qwerty lt: Lithuanian/qwerty
lv: Latvian/qwerty lv: Latvian/qwerty
mk: Macedonian/south_slavic mk: Macedonian/south_slavic
mn: Mongolian/mongolian mn_MN: Mongolian/mongolian
ms: Malay/qwerty ms_MY: Malay/qwerty
nb: Norwegian Bokmål/nordic nb: Norwegian Bokmål/nordic
(ne: Nepali Romanized/nepali_romanized) # disabled temporarily (ne: Nepali Romanized/nepali_romanized) # disabled temporarily
(ne: Nepali Traditional/nepali_traditional) # disabled temporarily (ne: Nepali Traditional/nepali_traditional) # disabled temporarily
@ -221,7 +221,7 @@
<subtype android:icon="@drawable/ic_ime_switcher_dark" <subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0xec2d3955" android:subtypeId="0xec2d3955"
android:imeSubtypeLocale="et" android:imeSubtypeLocale="et_EE"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=nordic,AsciiCapable,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=nordic,AsciiCapable,EmojiCapable"
/> />
@ -277,7 +277,7 @@
<subtype android:icon="@drawable/ic_ime_switcher_dark" <subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0xe39ac3ca" android:subtypeId="0xe39ac3ca"
android:imeSubtypeLocale="hy" android:imeSubtypeLocale="hy_AM"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=armenian_phonetic,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=armenian_phonetic,EmojiCapable"
/> />
@ -314,7 +314,7 @@
<subtype android:icon="@drawable/ic_ime_switcher_dark" <subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x6e119e6a" android:subtypeId="0x6e119e6a"
android:imeSubtypeLocale="ka" android:imeSubtypeLocale="ka_GE"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=georgian,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=georgian,EmojiCapable"
/> />
@ -330,11 +330,10 @@
<subtype android:icon="@drawable/ic_ime_switcher_dark" <subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x1365683a" android:subtypeId="0x1365683a"
android:imeSubtypeLocale="km" android:imeSubtypeLocale="km_KH"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=khmer,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=khmer,EmojiCapable"
/> />
<!-- android:subtypeId="Need this for km" -->
<subtype android:icon="@drawable/ic_ime_switcher_dark" <subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x2e391c04" android:subtypeId="0x2e391c04"
@ -345,7 +344,7 @@
<subtype android:icon="@drawable/ic_ime_switcher_dark" <subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x8315772c" android:subtypeId="0x8315772c"
android:imeSubtypeLocale="lo" android:imeSubtypeLocale="lo_LA"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=lao,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=lao,EmojiCapable"
/> />
@ -373,14 +372,14 @@
<subtype android:icon="@drawable/ic_ime_switcher_dark" <subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0xcdcfc3ab" android:subtypeId="0xcdcfc3ab"
android:imeSubtypeLocale="mn" android:imeSubtypeLocale="mn_MN"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=mongolian,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=mongolian,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_ime_switcher_dark" <subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x84c87c61" android:subtypeId="0x84c87c61"
android:imeSubtypeLocale="ms" android:imeSubtypeLocale="ms_MY"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
/> />