aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-07-30 16:58:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-30 16:58:02 +0000
commit1d1ba8ec2c5b1eebb3b3e946c97bc9166f9a155c (patch)
treef23c446aa28f88c07bfa4290efac24f634dc06d5 /java/res
parentec8472b5f5e478ba4eb830a7603da9c5a4637461 (diff)
parent0304c77750e1ff6504a70ef3d5e16f3d334bd510 (diff)
downloadlatinime-1d1ba8ec2c5b1eebb3b3e946c97bc9166f9a155c.tar.gz
latinime-1d1ba8ec2c5b1eebb3b3e946c97bc9166f9a155c.tar.xz
latinime-1d1ba8ec2c5b1eebb3b3e946c97bc9166f9a155c.zip
am 0304c777: Merge "[SD10] Add script checks for Lao and Khmer" into lmp-dev
* commit '0304c77750e1ff6504a70ef3d5e16f3d334bd510': [SD10] Add script checks for Lao and Khmer
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values/attrs.xml2
-rw-r--r--java/res/xml/keyboard_layout_set_khmer.xml2
-rw-r--r--java/res/xml/keyboard_layout_set_lao.xml2
3 files changed, 6 insertions, 0 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 5434106c5..9d828ef91 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -488,6 +488,8 @@
<enum name="hebrew" value="4" />
<enum name="armenian" value="5" />
<enum name="georgian" value="6" />
+ <enum name="khmer" value="7" />
+ <enum name="lao" value="8" />
</attr>
</declare-styleable>
diff --git a/java/res/xml/keyboard_layout_set_khmer.xml b/java/res/xml/keyboard_layout_set_khmer.xml
index 181f98b3d..752c8520a 100644
--- a/java/res/xml/keyboard_layout_set_khmer.xml
+++ b/java/res/xml/keyboard_layout_set_khmer.xml
@@ -20,6 +20,8 @@
<KeyboardLayoutSet
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <Feature
+ latin:supportedScript="khmer" />
<Element
latin:elementName="alphabet"
latin:elementKeyboard="@xml/kbd_khmer"
diff --git a/java/res/xml/keyboard_layout_set_lao.xml b/java/res/xml/keyboard_layout_set_lao.xml
index 2ffde45db..6285f87f9 100644
--- a/java/res/xml/keyboard_layout_set_lao.xml
+++ b/java/res/xml/keyboard_layout_set_lao.xml
@@ -20,6 +20,8 @@
<KeyboardLayoutSet
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <Feature
+ latin:supportedScript="lao" />
<Element
latin:elementName="alphabet"
latin:elementKeyboard="@xml/kbd_lao"