commit 2affaf91a04d63e0994102299816014a8bbe11e1
author Tadashi G. Takaoka <takaoka@google.com> Wed Feb 08 16:12:11 2012 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Wed Feb 08 16:12:31 2012 +0900
tree ee9bbb3e0de8c31140f9d9e8ab3b614ed50938cf
parent 71a14420d815824605ffc04b47b97386848d31b3

Rename mini keyboard to more keys keyboard

Change-Id: Ie4c85e8ca5a1f41a420aae5c1cd9c1cb07e237e5

java/res/values/attrs.xml

diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 410a942..86e3fe3 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -25,11 +25,11 @@
         <attr name="keyboardViewStyle" format="reference" />
         <!-- LatinKeyboardView style -->
         <attr name="latinKeyboardViewStyle" format="reference" />
-        <!-- MiniKeyboard style -->
-        <attr name="miniKeyboardStyle" format="reference" />
-        <!-- MiniKeyboardView style -->
-        <attr name="miniKeyboardViewStyle" format="reference" />
-        <attr name="miniKeyboardPanelStyle" format="reference" />
+        <!-- MoreKeysKeyboard style -->
+        <attr name="moreKeysKeyboardStyle" format="reference" />
+        <!-- MoreKeysKeyboardView style -->
+        <attr name="moreKeysKeyboardViewStyle" format="reference" />
+        <attr name="moreKeysKeyboardPanelStyle" format="reference" />
         <!-- Suggestions strip style -->
         <attr name="suggestionsStripBackgroundStyle" format="reference" />
         <attr name="suggestionsViewStyle" format="reference" />
@@ -152,8 +152,8 @@
         <attr name="longPressSpaceKeyTimeout" format="integer" />
         <!-- Ignore special key timeout while typing in millisecond. -->
         <attr name="ignoreSpecialKeyTimeout" format="integer" />
-        <!-- Mini-keyboard will shown at touched point. -->
-        <attr name="showMiniKeyboardAtTouchedPoint" format="boolean" />
+        <!-- More keys keyboard will shown at touched point. -->
+        <attr name="showMoreKeysKeyboardAtTouchedPoint" format="boolean" />
     </declare-styleable>
 
     <declare-styleable name="SuggestionsView">
@@ -232,7 +232,10 @@
              been replaced, those remaining entries are appended at the end of moreKeys. -->
         <attr name="additionalMoreKeys" format="string" />
         <!-- Maximum column of more keys keyboard -->
-        <attr name="maxMoreKeysColumn" format="integer" />
+        <attr name="maxMoreKeysColumn" format="integer">
+            <!-- This should be aligned with  -->
+            <flag name="fixedWidthMoreKeysColumn" value="0x8000000" />
+        </attr>
         <attr name="backgroundType" format="enum">
             <!-- This should be aligned with Key.BACKGROUND_TYPE_* -->
             <enum name="normal" value="0" />