diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-10-16 14:22:41 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-10-16 14:22:41 -0700 |
| commit | bfef552e623b2005afa0c53041183c787cd44bb2 (patch) | |
| tree | 47fc92df95d0a7a88f0435d8f411c0a49faaafde /java | |
| parent | 34ad4e0879bbaa23a8ac493d174f804f1d81e25b (diff) | |
| parent | ea3db813ccb0744129358b9db0b21b9d27b16dde (diff) | |
| download | latinime-bfef552e623b2005afa0c53041183c787cd44bb2.tar.gz latinime-bfef552e623b2005afa0c53041183c787cd44bb2.tar.xz latinime-bfef552e623b2005afa0c53041183c787cd44bb2.zip | |
am ea3db813: Merge "Do not merge. Remove Azerbaijani subtype" into klp-dev
* commit 'ea3db813ccb0744129358b9db0b21b9d27b16dde':
Do not merge. Remove Azerbaijani subtype
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml/method.xml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index f0e04c220..cef2451e2 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -24,7 +24,7 @@ keyboard_locale: script_name/keyboard_layout_set af: Afrikaans/qwerty ar: Arabic/arabic - az: Azerbaijani/qwerty + (az: Azerbaijani/qwerty) # disabled temporarily. waiting for string resources. be: Belarusian/east_slavic bg: Bulgarian/bulgarian bg: Bulgarian/bulgarian_bds @@ -53,7 +53,7 @@ it: Italian/qwerty iw: Hebrew/hebrew # "he" is official language code of Hebrew. ka: Georgian/georgian - (kk: Kazakh/east_slavic) # disabled temporarily. waiting for strnig resources. + (kk: Kazakh/east_slavic) # disabled temporarily. waiting for string resources. km: Khmer/khmer ky: Kyrgyz/east_slavic lo: Lao/lao @@ -63,8 +63,8 @@ mn: Mongolian/mongolian ms: Malay/qwerty nb: Norwegian Bokmål/nordic - ne: Nepali Romanized/nepali_romanized # disabled temporarily - ne: Nepali Traditional/nepali_traditional # disabled temporarily + (ne: Nepali Romanized/nepali_romanized) # disabled temporarily + (ne: Nepali Traditional/nepali_traditional) # disabled temporarily nl: Dutch/qwerty nl_BE: Dutch Belgium/azerty pl: Polish/qwerty @@ -123,6 +123,7 @@ android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable" /> + <!-- <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x70b0f974" @@ -130,6 +131,7 @@ android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" /> + --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x1dc3a859" |