diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-06-27 14:06:07 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-06-27 14:06:07 +0000 |
| commit | f179e80483b8dcf2d2884e2be7098cf37f42a682 (patch) | |
| tree | 5179a6fc56a5845faea757f133a7fcc1ee92a38b /java/res | |
| parent | 940a402cd2e7c356fc4073f235a1beb7fc1498d9 (diff) | |
| parent | 593009bc9fa40b9e4adb3cbe8b2f86019bfdaf8a (diff) | |
| download | latinime-f179e80483b8dcf2d2884e2be7098cf37f42a682.tar.gz latinime-f179e80483b8dcf2d2884e2be7098cf37f42a682.tar.xz latinime-f179e80483b8dcf2d2884e2be7098cf37f42a682.zip | |
am 593009bc: Merge "[SD2] Add support for a new tag Feature in KeyboardLayoutSet"
* commit '593009bc9fa40b9e4adb3cbe8b2f86019bfdaf8a':
[SD2] Add support for a new tag Feature in KeyboardLayoutSet
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/attrs.xml | 11 | ||||
| -rw-r--r-- | java/res/xml/keyboard_layout_set_arabic.xml | 2 |
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" |