diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-08-11 19:34:23 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2014-08-11 19:34:23 +0900 |
| commit | 463339f195b2e1bb649c0420af3f50715bb7206e (patch) | |
| tree | 9c998a3d500d08d376f53c56af11595050f2a491 /java/res/xml/method.xml | |
| parent | e5e1e7001556fec3fe8b7303e5ab802cd3fd402e (diff) | |
| parent | aca5785a3dde5541a3c30508976136792f2986a5 (diff) | |
| download | latinime-463339f195b2e1bb649c0420af3f50715bb7206e.tar.gz latinime-463339f195b2e1bb649c0420af3f50715bb7206e.tar.xz latinime-463339f195b2e1bb649c0420af3f50715bb7206e.zip | |
resolved conflicts for merge of aca5785a to master
Change-Id: I01e8af21d6d019859da4a05995e77701a0d9c585
Diffstat (limited to 'java/res/xml/method.xml')
| -rw-r--r-- | java/res/xml/method.xml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index c717da2a3..e5387732e 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -92,6 +92,8 @@ sv: Swedish/nordic sw: Swahili/qwerty ta_IN: Tamil (India)/tamil + ta_LK: Tamil (Sri Lanka)/tamil + ta_SG: Tamil (Singapore)/tamil te_IN: Telugu (India)/telugu th: Thai/thai tl: Tagalog/spanish @@ -688,6 +690,22 @@ /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" + android:subtypeId="0x6ca12d84" + android:imeSubtypeLocale="ta_LK" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable" + android:isAsciiCapable="false" + /> + <subtype android:icon="@drawable/ic_ime_switcher_dark" + android:label="@string/subtype_generic" + android:subtypeId="0x785abbd9" + android:imeSubtypeLocale="ta_SG" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable" + android:isAsciiCapable="false" + /> + <subtype android:icon="@drawable/ic_ime_switcher_dark" + android:label="@string/subtype_generic" android:subtypeId="0x1e177389" android:imeSubtypeLocale="te_IN" android:imeSubtypeMode="keyboard" |