commit 520a297ad1d148a57bcf6559a9802d5d49182d70
author Tadashi G. Takaoka <takaoka@google.com> Sat Jun 25 19:38:55 2011 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Mon Jun 27 20:04:34 2011 +0900
tree 4c4ad4fbff8c6e3ba668b0ea6a3f99c55ff097d7
parent 7fb04fe007a6d0489168e9c87771db554c873464

Draw phone/number keyboard layout witout icon

This change introduces:

* New KeyboardView attribute
  * keyLargeLetterRatio to specify large letter text size.
  * keyHintLabelRatio to specify hint label text size.
  * keyHintLabelColor to specify hint label text color.
  * keyPreviewTextRatio to specify key preview text size.
* New Key.keyLabelOption flags
  * alignLeftOfCenter, align the key label slightly left of the key center.
  * largeLetter, use keyLargeLetterRatio to draw key letter.
  * hasHintLabel, draw keyHintLabel at the right of key letter.
  * followKeyHintLabelRatio, draw the key label following keyHintLabelRatio size.
* Renames
  * Key.keyHintLetter to keyHintLabel.
  * Key.keylLabelOption fontFixedWidth to fontMonoSpace.
  * Key.keylLabelOption popupHint to hasPopupHint.
* Removes
  * number icon releted attributes and declarations.

Change-Id: I2f456737e3a46209e5f48b5155951b2b21a33859

java/res/xml-sw600dp/kbd_number.xml

diff --git a/java/res/xml-sw600dp/kbd_number.xml b/java/res/xml-sw600dp/kbd_number.xml
index 2c7af0a..b3a1010 100644
--- a/java/res/xml-sw600dp/kbd_number.xml
+++ b/java/res/xml-sw600dp/kbd_number.xml
@@ -91,24 +91,27 @@
             <Row>
                 <Key
                     latin:keyLabel="-"
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyXPos="11.00%p"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="+"
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="."
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="1"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyXPos="38.75%p" />
                 <Key
-                    latin:keyLabel="2" />
+                    latin:keyLabel="2"
+                    latin:keyStyle="numKeyStyle" />
                 <Key
-                    latin:keyLabel="3" />
+                    latin:keyLabel="3"
+                    latin:keyStyle="numKeyStyle" />
                 <Key
                     latin:keyStyle="deleteKeyStyle"
                     latin:keyXPos="-11.00%p"
@@ -117,25 +120,27 @@
             </Row>
             <Row>
                 <Key
-                    latin:keyLabel="*"
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numStarKeyStyle"
                     latin:keyXPos="11.00%p"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="/"
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel=","
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="4"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyXPos="38.75%p" />
                 <Key
-                    latin:keyLabel="5" />
+                    latin:keyLabel="5"
+                    latin:keyStyle="numKeyStyle" />
                 <Key
-                    latin:keyLabel="6" />
+                    latin:keyLabel="6"
+                    latin:keyStyle="numKeyStyle" />
                 <Key
                     latin:keyStyle="returnKeyStyle"
                     latin:keyXPos="-11.00%p"
@@ -148,24 +153,27 @@
                      edge key. -->
                 <Key
                     latin:keyLabel="("
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyXPos="11.00%p"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel=")"
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="="
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="7"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyXPos="38.75%p" />
                 <Key
-                    latin:keyLabel="8" />
+                    latin:keyLabel="8"
+                    latin:keyStyle="numKeyStyle" />
                 <Key
-                    latin:keyLabel="9" />
+                    latin:keyLabel="9"
+                    latin:keyStyle="numKeyStyle" />
             </Row>
             <!-- This row is intentionally not marked as a bottom row -->
             <Row>
@@ -180,10 +188,11 @@
                     latin:keyStyle="numStarKeyStyle"
                     latin:keyXPos="38.75%p" />
                 <Key
-                    latin:keyLabel="0" />
+                    latin:keyLabel="0"
+                    latin:keyStyle="numKeyStyle" />
                 <Key
                     latin:keyLabel="#"
-                    latin:keyStyle="numLabelStyle" />
+                    latin:keyStyle="numKeyStyle" />
                 <Spacer
                     latin:keyXPos="-11.00%p"
                     latin:keyWidth="0%p" />