Support addtionalMoreKeys
This change also removes
* Unused more_keys_for_q, w, and p.
Change-Id: Idb99e5f6d8c2ad2d28437f42b35b21c282cd181f
diff --git a/java/res/xml/row_qwerty1.xml b/java/res/xml/row_qwerty1.xml
index e8e8d1b..cb1f4d2 100644
--- a/java/res/xml/row_qwerty1.xml
+++ b/java/res/xml/row_qwerty1.xml
@@ -27,43 +27,50 @@
<Key
latin:keyLabel="q"
latin:keyHintLabel="1"
- latin:moreKeys="@string/more_keys_for_q" />
+ latin:additionalMoreKeys="1" />
<Key
latin:keyLabel="w"
latin:keyHintLabel="2"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:additionalMoreKeys="2" />
<Key
latin:keyLabel="e"
latin:keyHintLabel="3"
+ latin:additionalMoreKeys="3"
latin:moreKeys="@string/more_keys_for_e" />
<Key
latin:keyLabel="r"
latin:keyHintLabel="4"
+ latin:additionalMoreKeys="4"
latin:moreKeys="@string/more_keys_for_r" />
<Key
latin:keyLabel="t"
latin:keyHintLabel="5"
+ latin:additionalMoreKeys="5"
latin:moreKeys="@string/more_keys_for_t" />
<Key
latin:keyLabel="y"
latin:keyHintLabel="6"
+ latin:additionalMoreKeys="6"
latin:moreKeys="@string/more_keys_for_y" />
<Key
latin:keyLabel="u"
latin:keyHintLabel="7"
+ latin:additionalMoreKeys="7"
latin:moreKeys="@string/more_keys_for_u" />
<Key
latin:keyLabel="i"
latin:keyHintLabel="8"
+ latin:additionalMoreKeys="8"
latin:moreKeys="@string/more_keys_for_i" />
<Key
latin:keyLabel="o"
latin:keyHintLabel="9"
+ latin:additionalMoreKeys="9"
latin:moreKeys="@string/more_keys_for_o" />
<Key
latin:keyLabel="p"
latin:keyHintLabel="0"
- latin:moreKeys="@string/more_keys_for_p"
+ latin:additionalMoreKeys="0"
latin:keyWidth="fillRight" />
</Row>
</merge>
diff --git a/java/res/xml/rows_arabic.xml b/java/res/xml/rows_arabic.xml
index dcee10e..2dcd831 100644
--- a/java/res/xml/rows_arabic.xml
+++ b/java/res/xml/rows_arabic.xml
@@ -30,18 +30,19 @@
<Key
latin:keyLabel="ض"
latin:keyHintLabel="1"
- latin:moreKeys="1,١" />
+ latin:additionalMoreKeys="1,١" />
<!-- \u0635: ARABIC LETTER SAD -->
<Key
latin:keyLabel="ص"
latin:keyHintLabel="2"
- latin:moreKeys="2,٢" />
+ latin:additionalMoreKeys="2,٢" />
<!-- \u0642: ARABIC LETTER QAF
\u06a8: ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
<Key
latin:keyLabel="ق"
latin:keyHintLabel="3"
- latin:moreKeys="3,٣,\u06a8" />
+ latin:additionalMoreKeys="3,٣"
+ latin:moreKeys="\u06a8" />
<!-- \u0641: ARABIC LETTER FEH
\u06a4: ARABIC LETTER VEH
\u06a2: ARABIC LETTER FEH WITH DOT MOVED BELOW
@@ -49,40 +50,43 @@
<Key
latin:keyLabel="ف"
latin:keyHintLabel="4"
- latin:moreKeys="4,٤,\u06a4,\u06a2,\u06a5" />
+ latin:additionalMoreKeys="4,٤"
+ latin:moreKeys="\u06a4,\u06a2,\u06a5" />
<!-- \u063a: ARABIC LETTER GHAIN -->
<Key
latin:keyLabel="غ"
latin:keyHintLabel="5"
- latin:moreKeys="5,٥" />
+ latin:additionalMoreKeys="5,٥" />
<!-- \u0639: ARABIC LETTER AIN -->
<Key
latin:keyLabel="ع"
latin:keyHintLabel="6"
- latin:moreKeys="6,٦" />
+ latin:additionalMoreKeys="6,٦" />
<!-- \u0647: ARABIC LETTER HEH
\ufeeb: ARABIC LETTER HEH INITIAL FORM
\u0647\u0640: ARABIC LETTER HEH + Zero width joiner -->
<Key
latin:keyLabel="ه"
latin:keyHintLabel="7"
- latin:moreKeys="7,٧,\ufeeb|\u0647\u200D" />
+ latin:additionalMoreKeys="7,٧"
+ latin:moreKeys="\ufeeb|\u0647\u200D" />
<!-- \u062e: ARABIC LETTER KHAH -->
<Key
latin:keyLabel="خ"
latin:keyHintLabel="8"
- latin:moreKeys="8,٨" />
+ latin:additionalMoreKeys="8,٨" />
<!-- \u062d: ARABIC LETTER HAH -->
<Key
latin:keyLabel="ح"
latin:keyHintLabel="9"
- latin:moreKeys="9,٩" />
+ latin:additionalMoreKeys="9,٩" />
<!-- \u062c: ARABIC LETTER JEEM
\u0686: ARABIC LETTER TCHEH -->
<Key
latin:keyLabel="ج"
latin:keyHintLabel="0"
- latin:moreKeys="0,٠,\u0686"
+ latin:additionalMoreKeys="0,٠"
+ latin:moreKeys="\u0686"
latin:keyWidth="fillRight" />
</Row>
<Row
diff --git a/java/res/xml/rows_azerty.xml b/java/res/xml/rows_azerty.xml
index b7a0936..142ebc0 100644
--- a/java/res/xml/rows_azerty.xml
+++ b/java/res/xml/rows_azerty.xml
@@ -29,51 +29,59 @@
<Key
latin:keyLabel="a"
latin:keyHintLabel="1"
+ latin:additionalMoreKeys="1"
latin:moreKeys="@string/more_keys_for_a" />
<Key
latin:keyLabel="z"
latin:keyHintLabel="2"
+ latin:additionalMoreKeys="2"
latin:moreKeys="@string/more_keys_for_z" />
<Key
latin:keyLabel="e"
latin:keyHintLabel="3"
+ latin:additionalMoreKeys="3"
latin:moreKeys="@string/more_keys_for_e" />
<Key
latin:keyLabel="r"
latin:keyHintLabel="4"
+ latin:additionalMoreKeys="4"
latin:moreKeys="@string/more_keys_for_r" />
<Key
latin:keyLabel="t"
latin:keyHintLabel="5"
+ latin:additionalMoreKeys="5"
latin:moreKeys="@string/more_keys_for_t" />
<Key
latin:keyLabel="y"
latin:keyHintLabel="6"
+ latin:additionalMoreKeys="6"
latin:moreKeys="@string/more_keys_for_y" />
<Key
latin:keyLabel="u"
latin:keyHintLabel="7"
+ latin:additionalMoreKeys="7"
latin:moreKeys="@string/more_keys_for_u" />
<Key
latin:keyLabel="i"
latin:keyHintLabel="8"
+ latin:additionalMoreKeys="8"
latin:moreKeys="@string/more_keys_for_i" />
<Key
latin:keyLabel="o"
latin:keyHintLabel="9"
+ latin:additionalMoreKeys="9"
latin:moreKeys="@string/more_keys_for_o" />
<Key
latin:keyLabel="p"
latin:keyHintLabel="0"
- latin:moreKeys="@string/more_keys_for_p"
+ latin:additionalMoreKeys="0"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="10%p"
>
<Key
- latin:keyLabel="q"
- latin:moreKeys="@string/more_keys_for_q" />
+ latin:keyLabel="q" />
<Key
latin:keyLabel="s"
latin:moreKeys="@string/more_keys_for_s" />
@@ -107,8 +115,7 @@
latin:keyWidth="15%p"
latin:visualInsetsRight="1%p" />
<Key
- latin:keyLabel="w"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:keyLabel="w" />
<Key
latin:keyLabel="x" />
<Key
diff --git a/java/res/xml/rows_bulgarian.xml b/java/res/xml/rows_bulgarian.xml
index 9b5a5e6..2eac93a 100644
--- a/java/res/xml/rows_bulgarian.xml
+++ b/java/res/xml/rows_bulgarian.xml
@@ -29,43 +29,44 @@
<Key
latin:keyLabel="ч"
latin:keyHintLabel="1"
- latin:moreKeys="1" />
+ latin:additionalMoreKeys="1" />
<Key
latin:keyLabel="ш"
latin:keyHintLabel="2"
- latin:moreKeys="2" />
+ latin:additionalMoreKeys="2" />
<Key
latin:keyLabel="е"
latin:keyHintLabel="3"
- latin:moreKeys="3" />
+ latin:additionalMoreKeys="3" />
<Key
latin:keyLabel="р"
latin:keyHintLabel="4"
- latin:moreKeys="4" />
+ latin:additionalMoreKeys="4" />
<Key
latin:keyLabel="т"
latin:keyHintLabel="5"
- latin:moreKeys="5" />
+ latin:additionalMoreKeys="5" />
<Key
latin:keyLabel="ъ"
latin:keyHintLabel="6"
- latin:moreKeys="6" />
+ latin:additionalMoreKeys="6" />
<Key
latin:keyLabel="у"
latin:keyHintLabel="7"
- latin:moreKeys="7" />
+ latin:additionalMoreKeys="7" />
<Key
latin:keyLabel="и"
latin:keyHintLabel="8"
- latin:moreKeys="8,ѝ" />
+ latin:additionalMoreKeys="8"
+ latin:moreKeys="ѝ" />
<Key
latin:keyLabel="о"
latin:keyHintLabel="9"
- latin:moreKeys="9" />
+ latin:additionalMoreKeys="9" />
<Key
latin:keyLabel="п"
latin:keyHintLabel="0"
- latin:moreKeys="0" />
+ latin:additionalMoreKeys="0" />
<Key
latin:keyLabel="я"
latin:keyWidth="fillRight" />
diff --git a/java/res/xml/rows_qwertz.xml b/java/res/xml/rows_qwertz.xml
index e578f9a..11fd933 100644
--- a/java/res/xml/rows_qwertz.xml
+++ b/java/res/xml/rows_qwertz.xml
@@ -29,43 +29,50 @@
<Key
latin:keyLabel="q"
latin:keyHintLabel="1"
- latin:moreKeys="@string/more_keys_for_q" />
+ latin:additionalMoreKeys="1" />
<Key
latin:keyLabel="w"
latin:keyHintLabel="2"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:additionalMoreKeys="2" />
<Key
latin:keyLabel="e"
latin:keyHintLabel="3"
+ latin:additionalMoreKeys="3"
latin:moreKeys="@string/more_keys_for_e" />
<Key
latin:keyLabel="r"
latin:keyHintLabel="4"
+ latin:additionalMoreKeys="4"
latin:moreKeys="@string/more_keys_for_r" />
<Key
latin:keyLabel="t"
latin:keyHintLabel="5"
+ latin:additionalMoreKeys="5"
latin:moreKeys="@string/more_keys_for_t" />
<Key
latin:keyLabel="z"
latin:keyHintLabel="6"
+ latin:additionalMoreKeys="6"
latin:moreKeys="@string/more_keys_for_z" />
<Key
latin:keyLabel="u"
latin:keyHintLabel="7"
+ latin:additionalMoreKeys="7"
latin:moreKeys="@string/more_keys_for_u" />
<Key
latin:keyLabel="i"
latin:keyHintLabel="8"
+ latin:additionalMoreKeys="8"
latin:moreKeys="@string/more_keys_for_i" />
<Key
latin:keyLabel="o"
latin:keyHintLabel="9"
+ latin:additionalMoreKeys="9"
latin:moreKeys="@string/more_keys_for_o" />
<Key
latin:keyLabel="p"
latin:keyHintLabel="0"
- latin:moreKeys="@string/more_keys_for_p"
+ latin:additionalMoreKeys="0"
latin:keyWidth="fillRight" />
</Row>
<include
diff --git a/java/res/xml/rows_scandinavian.xml b/java/res/xml/rows_scandinavian.xml
index 2bd246b..f5ba96c 100644
--- a/java/res/xml/rows_scandinavian.xml
+++ b/java/res/xml/rows_scandinavian.xml
@@ -29,43 +29,50 @@
<Key
latin:keyLabel="q"
latin:keyHintLabel="1"
- latin:moreKeys="@string/more_keys_for_q" />
+ latin:additionalMoreKeys="1" />
<Key
latin:keyLabel="w"
latin:keyHintLabel="2"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:additionalMoreKeys="2" />
<Key
latin:keyLabel="e"
latin:keyHintLabel="3"
+ latin:additionalMoreKeys="3"
latin:moreKeys="@string/more_keys_for_e" />
<Key
latin:keyLabel="r"
latin:keyHintLabel="4"
+ latin:additionalMoreKeys="4"
latin:moreKeys="@string/more_keys_for_r" />
<Key
latin:keyLabel="t"
latin:keyHintLabel="5"
+ latin:additionalMoreKeys="5"
latin:moreKeys="@string/more_keys_for_t" />
<Key
latin:keyLabel="y"
latin:keyHintLabel="6"
+ latin:additionalMoreKeys="6"
latin:moreKeys="@string/more_keys_for_y" />
<Key
latin:keyLabel="u"
latin:keyHintLabel="7"
+ latin:additionalMoreKeys="7"
latin:moreKeys="@string/more_keys_for_u" />
<Key
latin:keyLabel="i"
latin:keyHintLabel="8"
+ latin:additionalMoreKeys="8"
latin:moreKeys="@string/more_keys_for_i" />
<Key
latin:keyLabel="o"
latin:keyHintLabel="9"
+ latin:additionalMoreKeys="9"
latin:moreKeys="@string/more_keys_for_o" />
<Key
latin:keyLabel="p"
latin:keyHintLabel="0"
- latin:moreKeys="@string/more_keys_for_p" />
+ latin:additionalMoreKeys="0" />
<Key
latin:keyLabel="@string/keylabel_for_scandinavia_row1_11"
latin:keyWidth="fillRight" />
diff --git a/java/res/xml/rows_serbian.xml b/java/res/xml/rows_serbian.xml
index beb04d5..d2203ce 100644
--- a/java/res/xml/rows_serbian.xml
+++ b/java/res/xml/rows_serbian.xml
@@ -29,43 +29,43 @@
<Key
latin:keyLabel="љ"
latin:keyHintLabel="1"
- latin:moreKeys="1" />
+ latin:additionalMoreKeys="1" />
<Key
latin:keyLabel="њ"
latin:keyHintLabel="2"
- latin:moreKeys="2" />
+ latin:additionalMoreKeys="2" />
<Key
latin:keyLabel="е"
latin:keyHintLabel="3"
- latin:moreKeys="3" />
+ latin:additionalMoreKeys="3" />
<Key
latin:keyLabel="р"
latin:keyHintLabel="4"
- latin:moreKeys="4" />
+ latin:additionalMoreKeys="4" />
<Key
latin:keyLabel="т"
latin:keyHintLabel="5"
- latin:moreKeys="5" />
+ latin:additionalMoreKeys="5" />
<Key
latin:keyLabel="з"
latin:keyHintLabel="6"
- latin:moreKeys="6" />
+ latin:additionalMoreKeys="6" />
<Key
latin:keyLabel="у"
latin:keyHintLabel="7"
- latin:moreKeys="7" />
+ latin:additionalMoreKeys="7" />
<Key
latin:keyLabel="и"
latin:keyHintLabel="8"
- latin:moreKeys="8" />
+ latin:additionalMoreKeys="8" />
<Key
latin:keyLabel="о"
latin:keyHintLabel="9"
- latin:moreKeys="9" />
+ latin:additionalMoreKeys="9" />
<Key
latin:keyLabel="п"
latin:keyHintLabel="0"
- latin:moreKeys="0" />
+ latin:additionalMoreKeys="0" />
<Key
latin:keyLabel="ш"
latin:keyWidth="fillRight" />
diff --git a/java/res/xml/rows_slavic.xml b/java/res/xml/rows_slavic.xml
index 52f5af4..71e442c 100644
--- a/java/res/xml/rows_slavic.xml
+++ b/java/res/xml/rows_slavic.xml
@@ -29,43 +29,46 @@
<Key
latin:keyLabel="й"
latin:keyHintLabel="1"
- latin:moreKeys="1" />
+ latin:additionalMoreKeys="1" />
<Key
latin:keyLabel="ц"
latin:keyHintLabel="2"
- latin:moreKeys="2" />
+ latin:additionalMoreKeys="2" />
<Key
latin:keyLabel="у"
latin:keyHintLabel="3"
+ latin:additionalMoreKeys="3"
latin:moreKeys="@string/more_keys_for_slavic_u" />
<Key
latin:keyLabel="к"
latin:keyHintLabel="4"
- latin:moreKeys="4" />
+ latin:additionalMoreKeys="4" />
<Key
latin:keyLabel="е"
latin:keyHintLabel="5"
+ latin:additionalMoreKeys="5"
latin:moreKeys="@string/more_keys_for_slavic_ye" />
<Key
latin:keyLabel="н"
latin:keyHintLabel="6"
+ latin:additionalMoreKeys="6"
latin:moreKeys="@string/more_keys_for_slavic_en" />
<Key
latin:keyLabel="г"
latin:keyHintLabel="7"
- latin:moreKeys="7" />
+ latin:additionalMoreKeys="7" />
<Key
latin:keyLabel="ш"
latin:keyHintLabel="8"
- latin:moreKeys="8" />
+ latin:additionalMoreKeys="8" />
<Key
latin:keyLabel="@string/keylabel_for_slavic_shcha"
latin:keyHintLabel="9"
- latin:moreKeys="9" />
+ latin:additionalMoreKeys="9" />
<Key
latin:keyLabel="з"
latin:keyHintLabel="0"
- latin:moreKeys="0" />
+ latin:additionalMoreKeys="0" />
<Key
latin:keyLabel="х"
latin:moreKeys="@string/more_keys_for_slavic_ha"
diff --git a/java/res/xml/rows_symbols.xml b/java/res/xml/rows_symbols.xml
index fe9efbb..d0d0edb 100644
--- a/java/res/xml/rows_symbols.xml
+++ b/java/res/xml/rows_symbols.xml
@@ -30,33 +30,43 @@
>
<Key
latin:keyLabel="@string/keylabel_for_symbols_1"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_1"
latin:moreKeys="@string/more_keys_for_symbols_1" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_2"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_2"
latin:moreKeys="@string/more_keys_for_symbols_2" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_3"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_3"
latin:moreKeys="@string/more_keys_for_symbols_3" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_4"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_4"
latin:moreKeys="@string/more_keys_for_symbols_4" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_5"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_5"
latin:moreKeys="@string/more_keys_for_symbols_5" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_6"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_6"
latin:moreKeys="@string/more_keys_for_symbols_6" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_7"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_7"
latin:moreKeys="@string/more_keys_for_symbols_7" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_8"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_8"
latin:moreKeys="@string/more_keys_for_symbols_8" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_9"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_9"
latin:moreKeys="@string/more_keys_for_symbols_9" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_0"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_0"
latin:moreKeys="@string/more_keys_for_symbols_0"
latin:keyWidth="fillRight" />
</Row>