aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-08-11 11:27:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-11 11:27:52 +0000
commit35c099de2465bf5ba79b37eb557c2c230357ef87 (patch)
tree38e9c23aed6717fe9aea01e99237d8a7475ccab4 /java
parentaca5785a3dde5541a3c30508976136792f2986a5 (diff)
parentc9add10c38aabefe41979ec8b0098f3589df8acd (diff)
downloadlatinime-35c099de2465bf5ba79b37eb557c2c230357ef87.tar.gz
latinime-35c099de2465bf5ba79b37eb557c2c230357ef87.tar.xz
latinime-35c099de2465bf5ba79b37eb557c2c230357ef87.zip
am c9add10c: (DO NOT MERGE) Disable Sinhala keyboard for L-release
* commit 'c9add10c38aabefe41979ec8b0098f3589df8acd': (DO NOT MERGE) Disable Sinhala keyboard for L-release
Diffstat (limited to 'java')
-rw-r--r--java/res/xml/method.xml11
1 files changed, 9 insertions, 2 deletions
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index b3381c54c..4f8efa8d6 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -84,7 +84,7 @@
pt_PT: Portuguese (Portugal)/qwerty
ro: Romanian/qwerty
ru: Russian/east_slavic
- si_LK: Sinhala (Sri Lanka)/sinhala
+ (si_LK: Sinhala (Sri Lanka)/sinhala) # This is a preliminary keyboard layout.
sk: Slovak/qwerty
sl: Slovenian/qwerty
sr: Serbian/south_slavic
@@ -92,7 +92,7 @@
sv: Swedish/nordic
sw: Swahili/qwerty
ta_IN: Tamil (India)/tamil
- ta_LK: Tamil (Sri Lanka)/tamil
+ (ta_LK: Tamil (Sri Lanka)/tamil) # Disabled in conjunction with si_LK.
ta_SG: Tamil (Singapore)/tamil
te_IN: Telugu (India)/telugu
th: Thai/thai
@@ -616,6 +616,9 @@
android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable"
android:isAsciiCapable="false"
/>
+ <!-- TODO: This Sinhala keyboard is a preliminary layout.
+ This isn't based on the final specification. -->
+ <!--
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0x5c6b3bde"
@@ -624,6 +627,7 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=sinhala,EmojiCapable"
android:isAsciiCapable="false"
/>
+ -->
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0x8e94d413"
@@ -690,6 +694,8 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable"
android:isAsciiCapable="false"
/>
+ <!-- TODO: Enable ta_LK subtype when si_LK subtype is ready -->
+ <!--
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0x6ca12d84"
@@ -698,6 +704,7 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable"
android:isAsciiCapable="false"
/>
+ -->
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0x785abbd9"