aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-07-30 06:03:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-24 16:04:26 +0000
commit0304c77750e1ff6504a70ef3d5e16f3d334bd510 (patch)
tree98b4118c6bd629007b7dd9ec08e0e249400c3e3f /java/res
parent7f545a57c987862d55966ac08ef64cfe0b9f51e4 (diff)
parenta9c12692ed11a4712ceb743f446e51a735eeabb6 (diff)
downloadlatinime-0304c77750e1ff6504a70ef3d5e16f3d334bd510.tar.gz
latinime-0304c77750e1ff6504a70ef3d5e16f3d334bd510.tar.xz
latinime-0304c77750e1ff6504a70ef3d5e16f3d334bd510.zip
Merge "[SD10] Add script checks for Lao and Khmer" into lmp-dev
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"