aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-07-30 17:11:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-30 17:11:37 +0000
commitd5228f9c4a15f6d6d74989c5c5f237aed6eb361b (patch)
treed02770e77daa2c8420679d9a5ab51eb6f9f91d8e /java/res
parent818d3ee923ccdeab9c5091b781ea1bab1987bf69 (diff)
parent1d1ba8ec2c5b1eebb3b3e946c97bc9166f9a155c (diff)
downloadlatinime-d5228f9c4a15f6d6d74989c5c5f237aed6eb361b.tar.gz
latinime-d5228f9c4a15f6d6d74989c5c5f237aed6eb361b.tar.xz
latinime-d5228f9c4a15f6d6d74989c5c5f237aed6eb361b.zip
am 1d1ba8ec: am 0304c777: Merge "[SD10] Add script checks for Lao and Khmer" into lmp-dev
* commit '1d1ba8ec2c5b1eebb3b3e946c97bc9166f9a155c': [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"