aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-09-25 09:26:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-25 09:26:43 +0000
commit899d54f9e84b7f63bc2b05424904fc3fcb0fb1c6 (patch)
tree81ce3b89e7b2673e806ad87154abe156169f8c5b /java/res
parentdc0ec946d4adbcabaddc5c048b57a1ded36cf077 (diff)
parent22e2fa372c888e64a48eca8f98f0606c891f17ff (diff)
downloadlatinime-899d54f9e84b7f63bc2b05424904fc3fcb0fb1c6.tar.gz
latinime-899d54f9e84b7f63bc2b05424904fc3fcb0fb1c6.tar.xz
latinime-899d54f9e84b7f63bc2b05424904fc3fcb0fb1c6.zip
am 22e2fa37: Merge "Add allowRedundantMoreKeys attribute"
* commit '22e2fa372c888e64a48eca8f98f0606c891f17ff': Add allowRedundantMoreKeys attribute
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values/attrs.xml2
-rw-r--r--java/res/xml/keyboard_layout_set_nordic.xml3
-rw-r--r--java/res/xml/keyboard_layout_set_swiss.xml3
3 files changed, 6 insertions, 2 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 8ee859bc7..f2072fd37 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -518,6 +518,8 @@
<attr name="enableProximityCharsCorrection" format="boolean" />
<!-- Indicates if the keyboard layout supports being split or not. false by default -->
<attr name="supportsSplitLayout" format="boolean" />
+ <!-- Allow redundant more keys when they are in the base layout. true by default. -->
+ <attr name="allowRedundantMoreKeys" format="boolean" />
</declare-styleable>
<declare-styleable name="KeyboardLayoutSet_Feature">
diff --git a/java/res/xml/keyboard_layout_set_nordic.xml b/java/res/xml/keyboard_layout_set_nordic.xml
index 1f00f440e..d07f78a9a 100644
--- a/java/res/xml/keyboard_layout_set_nordic.xml
+++ b/java/res/xml/keyboard_layout_set_nordic.xml
@@ -23,7 +23,8 @@
<Element
latin:elementName="alphabet"
latin:elementKeyboard="@xml/kbd_nordic"
- latin:enableProximityCharsCorrection="true" />
+ latin:enableProximityCharsCorrection="true"
+ latin:allowRedundantMoreKeys="true" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
diff --git a/java/res/xml/keyboard_layout_set_swiss.xml b/java/res/xml/keyboard_layout_set_swiss.xml
index e17a5ab8b..f925b83f1 100644
--- a/java/res/xml/keyboard_layout_set_swiss.xml
+++ b/java/res/xml/keyboard_layout_set_swiss.xml
@@ -23,7 +23,8 @@
<Element
latin:elementName="alphabet"
latin:elementKeyboard="@xml/kbd_swiss"
- latin:enableProximityCharsCorrection="true" />
+ latin:enableProximityCharsCorrection="true"
+ latin:allowRedundantMoreKeys="true" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />