commit aeeed758480b0fac848f4556884d978f3004555b
author Tadashi G. Takaoka <takaoka@google.com> Mon Feb 13 14:34:09 2012 -0800
committer Tadashi G. Takaoka <takaoka@google.com> Fri Feb 17 00:49:18 2012 -0800
tree af687ad53f173a9070148101a28784546dff399d
parent 25ff89a75cb8b797bdaf0c7b78e50fd454c1b1e2

Support fixed order more keys

Change-Id: I979f54e8b54243da4d23cfbe08198d2aa495f870

java/res/xml/key_styles_common.xml

diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
index 0e31bcb..4d0ad29 100644
--- a/java/res/xml/key_styles_common.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -188,6 +188,5 @@
         latin:keyHintLabel="@string/keyhintlabel_for_punctuation"
         latin:keyLabelFlags="hasPopupHint|preserveCase"
         latin:moreKeys="@string/more_keys_for_punctuation"
-        latin:maxMoreKeysColumn="@integer/more_keys_keyboard_column_for_punctuation"
         latin:backgroundType="functional" />
 </merge>

java/res/xml/key_styles_enter_phone.xml

diff --git a/java/res/xml/key_styles_enter_phone.xml b/java/res/xml/key_styles_enter_phone.xml
index 6af81fb..af34cb8 100644
--- a/java/res/xml/key_styles_enter_phone.xml
+++ b/java/res/xml/key_styles_enter_phone.xml
@@ -55,7 +55,6 @@
                 latin:keyOutputText=":-) "
                 latin:keyLabelFlags="hasPopupHint"
                 latin:moreKeys="@string/more_keys_for_smiley"
-                latin:maxMoreKeysColumn="5"
                 latin:backgroundType="functional" />
         </case>
         <case

java/res/xml/rows_azerty.xml

diff --git a/java/res/xml/rows_azerty.xml b/java/res/xml/rows_azerty.xml
index 6f607cb..bd3ff6f 100644
--- a/java/res/xml/rows_azerty.xml
+++ b/java/res/xml/rows_azerty.xml
@@ -130,13 +130,9 @@
         <Key
             latin:keyLabel="n"
             latin:moreKeys="@string/more_keys_for_n" />
-        <!-- TODO: Introduce a flag, such as strinctMoreKeysOrder, to control moreKeys display
-             order more precisely. -->
-        <!-- This key is close enough to right edge, so that the 4-more keys will be displayed in
-             order of "4,3,1,2". See @string/more_keys_for_single_quote -->
         <Key
             latin:keyLabel="\'"
-            latin:moreKeys="&#x2018;,&#x2019;,&#x201B;,&#x201A;" />
+            latin:moreKeys="@string/more_keys_for_single_quote" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight"

java/res/xml/rows_symbols.xml

diff --git a/java/res/xml/rows_symbols.xml b/java/res/xml/rows_symbols.xml
index 05699e0..27f75b5 100644
--- a/java/res/xml/rows_symbols.xml
+++ b/java/res/xml/rows_symbols.xml
@@ -109,8 +109,7 @@
             latin:moreKeys="¡" />
         <Key
             latin:keyLabel="&quot;"
-            latin:moreKeys="@string/more_keys_for_double_quote"
-            latin:maxMoreKeysColumn="4" />
+            latin:moreKeys="@string/more_keys_for_double_quote" />
         <Key
             latin:keyLabel="\'"
             latin:moreKeys="@string/more_keys_for_single_quote" />