commit 15c99e9f1a7776b95325d36cf9e38b6d674e483b
author Tadashi G. Takaoka <takaoka@google.com> Mon Jan 30 11:14:45 2012 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Mon Jan 30 17:04:25 2012 +0900
tree 93a47af1ca7c59fdb17549ac24eee348e0bc4587
parent 38a3ad3e3ca1b4e594bcd189277454d12619b868

Support addtionalMoreKeys

This change also removes
  * Unused more_keys_for_q, w, and p.

Change-Id: Idb99e5f6d8c2ad2d28437f42b35b21c282cd181f

java/res/xml/rows_arabic.xml

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