commit ed8eabcc397134f3f832f53d0f6e50c88c182f77
author Tadashi G. Takaoka <takaoka@google.com> Thu Sep 16 13:10:14 2010 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Thu Sep 16 20:02:04 2010 +0900
tree 82e5a8f958d561865b479f3ad1b117a67578fca6
parent 08cfebda8b535424ee5f2790ab5a15d18a995a39

Cleanup keyboard layout files

Change-Id: I095c1294b9e826b503ff741eeff9dc93ad39f060

java/res/xml/kbd_phone.xml

diff --git a/java/res/xml/kbd_phone.xml b/java/res/xml/kbd_phone.xml
index 73d022f..dd42d76 100644
--- a/java/res/xml/kbd_phone.xml
+++ b/java/res/xml/kbd_phone.xml
@@ -17,49 +17,86 @@
 ** limitations under the License.
 */
 -->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+
+<Keyboard
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:keyWidth="26.67%p"
     android:horizontalGap="0px"
     android:verticalGap="0px"
     android:keyHeight="@dimen/key_height"
+>
+    <Row
+        android:rowEdgeFlags="top"
     >
-
+        <Key
+            android:codes="49"
+            android:keyIcon="@drawable/sym_keyboard_num1"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="50"
+            android:keyIcon="@drawable/sym_keyboard_num2" />
+        <Key
+            android:codes="51"
+            android:keyIcon="@drawable/sym_keyboard_num3" />
+        <Key
+            android:keyLabel="-"
+            android:keyWidth="20%p"
+            android:keyEdgeFlags="right" />
+    </Row>
     <Row>
-        <Key android:codes="49" android:keyIcon="@drawable/sym_keyboard_num1" android:keyEdgeFlags="left"/>
-        <Key android:codes="50" android:keyIcon="@drawable/sym_keyboard_num2"/>
-        <Key android:codes="51" android:keyIcon="@drawable/sym_keyboard_num3"/>
-        <Key android:keyLabel="-" android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+        <Key
+            android:codes="52"
+            android:keyIcon="@drawable/sym_keyboard_num4"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="53"
+            android:keyIcon="@drawable/sym_keyboard_num5" />
+        <Key
+            android:codes="54"
+            android:keyIcon="@drawable/sym_keyboard_num6" />
+        <Key
+            android:keyLabel="."
+            android:keyWidth="20%p"
+            android:keyEdgeFlags="right" />
     </Row>
-
     <Row>
-        <Key android:codes="52" android:keyIcon="@drawable/sym_keyboard_num4" android:keyEdgeFlags="left"/>
-        <Key android:codes="53" android:keyIcon="@drawable/sym_keyboard_num5"/>
-        <Key android:codes="54" android:keyIcon="@drawable/sym_keyboard_num6"/>
-        <Key android:keyLabel="." android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+        <Key
+            android:codes="55"
+            android:keyIcon="@drawable/sym_keyboard_num7"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="56"
+            android:keyIcon="@drawable/sym_keyboard_num8" />
+        <Key
+            android:codes="57"
+            android:keyIcon="@drawable/sym_keyboard_num9" />
+        <Key
+            android:codes="@integer/key_delete"
+            android:keyIcon="@drawable/sym_keyboard_delete"
+            android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+            android:keyWidth="20%p"
+            android:isRepeatable="true"
+            android:keyEdgeFlags="right" />
     </Row>
-    
-    <Row>
-        <Key android:codes="55" android:keyIcon="@drawable/sym_keyboard_num7" android:keyEdgeFlags="left"/>
-        <Key android:codes="56" android:keyIcon="@drawable/sym_keyboard_num8"/>
-        <Key android:codes="57" android:keyIcon="@drawable/sym_keyboard_num9"/>
-        <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" 
-                android:iconPreview="@drawable/sym_keyboard_feedback_delete"
-                android:keyWidth="20%p"
-                android:isRepeatable="true" android:keyEdgeFlags="right"/>
+    <Row
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyIcon="@drawable/sym_keyboard_numalt"
+            android:iconPreview="@drawable/sym_keyboard_feedback_numalt" />
+        <Key
+            android:codes="48"
+            android:keyIcon="@drawable/sym_keyboard_num0" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:isRepeatable="true" />
+        <Key
+            android:codes="@integer/key_return"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:keyWidth="20%p"
+            android:keyEdgeFlags="right" />
     </Row>
-    
-    <Row android:rowEdgeFlags="bottom">
-        <Key android:codes="-2" android:keyIcon="@drawable/sym_keyboard_numalt"
-                android:iconPreview="@drawable/sym_keyboard_feedback_numalt"/>
-
-        <Key android:codes="48" android:keyIcon="@drawable/sym_keyboard_num0"/>
-
-        <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" 
-                android:iconPreview="@drawable/sym_keyboard_feedback_space"
-                android:isRepeatable="true"/>
-        <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
-                android:keyWidth="20%p"
-                android:keyEdgeFlags="right"/>
-    </Row>
-    
-</Keyboard>
\ No newline at end of file
+</Keyboard>