aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-06-27 14:03:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-26 23:14:30 +0000
commit593009bc9fa40b9e4adb3cbe8b2f86019bfdaf8a (patch)
treea9662b1f4a6dea44c6a7df4770d36205ff35e36e /java/res
parent938bb4a4d50114eb741a128f7a75d50f1af55869 (diff)
parentaca2ef85e1af82ccadbd0cbdd691a680a03a824d (diff)
downloadlatinime-593009bc9fa40b9e4adb3cbe8b2f86019bfdaf8a.tar.gz
latinime-593009bc9fa40b9e4adb3cbe8b2f86019bfdaf8a.tar.xz
latinime-593009bc9fa40b9e4adb3cbe8b2f86019bfdaf8a.zip
Merge "[SD2] Add support for a new tag Feature in KeyboardLayoutSet"
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values/attrs.xml11
-rw-r--r--java/res/xml/keyboard_layout_set_arabic.xml2
2 files changed, 13 insertions, 0 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index fcb919d0b..7dda0a652 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -488,6 +488,17 @@
<attr name="enableProximityCharsCorrection" format="boolean" />
</declare-styleable>
+ <declare-styleable name="KeyboardLayoutSet_Feature">
+ <!-- This should be aligned with ScriptUtils.SCRIPT_* -->
+ <attr name="supportedScript" format="enum">
+ <enum name="latin" value="0" />
+ <enum name="cyrillic" value="1" />
+ <enum name="greek" value="2" />
+ <enum name="arabic" value="3" />
+ <enum name="hebrew" value="4" />
+ </attr>
+ </declare-styleable>
+
<declare-styleable name="SeekBarDialogPreference">
<attr name="maxValue" format="integer" />
<attr name="minValue" format="integer" />
diff --git a/java/res/xml/keyboard_layout_set_arabic.xml b/java/res/xml/keyboard_layout_set_arabic.xml
index 10e95bd30..1bf8c6295 100644
--- a/java/res/xml/keyboard_layout_set_arabic.xml
+++ b/java/res/xml/keyboard_layout_set_arabic.xml
@@ -20,6 +20,8 @@
<KeyboardLayoutSet
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <Feature
+ latin:supportedScript="arabic" />
<Element
latin:elementName="alphabet"
latin:elementKeyboard="@xml/kbd_arabic"