Cleanup keyboard layout files

Change-Id: I095c1294b9e826b503ff741eeff9dc93ad39f060

1 files changed, 173 insertions, 121 deletions

diff --git a/java/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml
index fbdead6c3..ba5a30c93 100644
--- a/java/res/xml/kbd_symbols.xml
+++ b/java/res/xml/kbd_symbols.xml
@@ -18,145 +18,197 @@
 */
 -->
 
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:keyWidth="10%p"
     android:horizontalGap="0px"
     android:verticalGap="0px"
     android:keyHeight="@dimen/key_height"
+>
+    <Row
+        android:rowEdgeFlags="top"
     >
-
-    <Row>
-        <Key android:codes="49" android:keyLabel="1" android:keyEdgeFlags="left"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="¹½⅓¼⅛"
-        />
-        <Key android:codes="50" android:keyLabel="2"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="²⅔"
-        />
-        <Key android:codes="51" android:keyLabel="3"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="³¾⅜"
-        />
-        <Key android:codes="52" android:keyLabel="4"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="⁴"
-        />
-        <Key android:codes="53" android:keyLabel="5"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="⅝"
-        />
-        <Key android:codes="54" android:keyLabel="6"/>
-        <Key android:codes="55" android:keyLabel="7"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="⅞"
-        />
-        <Key android:codes="56" android:keyLabel="8"/>
-        <Key android:codes="57" android:keyLabel="9"/>
-        <Key android:codes="48" android:keyLabel="0" 
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="ⁿ∅"        
-                android:keyEdgeFlags="right"/>
+        <Key
+            android:keyLabel="1"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="¹½⅓¼⅛"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:keyLabel="2"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="²⅔" />
+        <Key
+            android:keyLabel="3"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="³¾⅜" />
+        <Key
+            android:keyLabel="4"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="⁴" />
+        <Key
+            android:keyLabel="5"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="⅝" />
+        <Key
+            android:keyLabel="6" />
+        <Key
+            android:keyLabel="7"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="⅞" />
+        <Key
+            android:keyLabel="8" />
+        <Key
+            android:keyLabel="9" />
+        <Key
+            android:keyLabel="0"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="ⁿ∅"
+            android:keyEdgeFlags="right" />
     </Row>
-    
     <Row>
-        <Key android:codes="64" android:keyLabel="\@" android:keyEdgeFlags="left"/>
-        <Key android:codes="35" android:keyLabel="\#"/>
-        <Key android:codes="36" android:keyLabel="$"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="¢£€¥₣₤₱"
-        />        
-        <Key android:codes="37" android:keyLabel="%"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="‰"
-        />
-        <Key android:codes="38" android:keyLabel="&amp;"/>
-        <Key android:codes="42" android:keyLabel="*"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="†‡★"
-        />
-        <Key android:codes="45" android:keyLabel="-"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_–—"
-        />
-        <Key android:keyLabel="+"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="±"
-        />
-        <Key android:codes="40" android:keyLabel="("
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="[{&lt;"
-        />
-        <Key android:codes="41" android:keyLabel=")" android:keyEdgeFlags="right"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="]}&gt;"
-        />
+        <Key
+            android:keyLabel="\@"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:keyLabel="\#" />
+        <Key
+            android:keyLabel="$"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="¢£€¥₣₤₱" />
+        <Key
+            android:keyLabel="%"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="‰" />
+        <Key
+            android:keyLabel="&amp;" />
+        <Key
+            android:keyLabel="*"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="†‡★" />
+        <Key
+            android:keyLabel="-"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="_–—" />
+        <Key
+            android:keyLabel="+"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="±" />
+        <Key
+            android:keyLabel="("
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="[{&lt;" />
+        <Key
+            android:keyLabel=")"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="]}&gt;"
+            android:keyEdgeFlags="right" />
     </Row>
-    
     <Row>
-        <Key android:codes="-1" android:keyLabel="@string/label_alt_key"
-                android:keyWidth="15%p" android:isModifier="true"
-                android:isSticky="true" android:keyEdgeFlags="left"/>
-        <Key android:codes="33" android:keyLabel="!"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="¡"
-        />
-        <Key android:codes="34" android:keyLabel="&quot;"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="“”«»˝"
-        />
-        <Key android:codes="39" android:keyLabel="\'"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="‘’"
-        />
-        <Key android:codes="58" android:keyLabel=":"/>
-        <Key android:codes="59" android:keyLabel=";"/>
-        <Key android:codes="47" android:keyLabel="/" />
-        <Key android:codes="63" android:keyLabel="\?"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="¿"
-        />
-        <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" android:keyWidth="15%p" android:keyEdgeFlags="right"
-                android:iconPreview="@drawable/sym_keyboard_feedback_delete"
-                android:isRepeatable="true" android:isModifier="true"/>
+        <Key
+            android:codes="@integer/key_shift"
+            android:keyLabel="@string/label_alt_key"
+            android:keyWidth="15%p"
+            android:isModifier="true"
+            android:isSticky="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:keyLabel="!"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="¡" />
+        <Key
+            android:keyLabel="&quot;"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="“”«»˝" />
+        <Key
+            android:keyLabel="\'"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="‘’" />
+        <Key
+            android:keyLabel=":" />
+        <Key
+            android:keyLabel=";" />
+        <Key
+            android:keyLabel="/" />
+        <Key
+            android:keyLabel="\?"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="¿" />
+        <Key
+            android:codes="@integer/key_delete"
+            android:keyIcon="@drawable/sym_keyboard_delete"
+            android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+            android:keyWidth="15%p"
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyEdgeFlags="right" />
     </Row>
-
     <Row
         android:keyboardMode="@+id/mode_symbols"
         android:rowEdgeFlags="bottom"
     >
-        <Key android:codes="-2" android:keyLabel="@string/label_alpha_key"
-                android:keyWidth="20%p" android:keyEdgeFlags="left" android:isModifier="true"/>
-        <Key android:codes="@integer/key_f1" android:isModifier="true"/>
-        <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
-                android:keyWidth="40%p"
-                android:iconPreview="@drawable/sym_keyboard_feedback_space"
-                android:isRepeatable="true" android:isModifier="true"/>
-        <Key android:codes="46" android:keyLabel="."
-                android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/>
-        <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:keyWidth="20%p" android:keyEdgeFlags="right"
-                android:iconPreview="@drawable/sym_keyboard_feedback_return"
-                android:isModifier="true"/>
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_alpha_key"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="40%p"
+            android:isModifier="true"
+            android:isRepeatable="true" />
+        <Key
+            android:keyLabel="."
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_return"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
     </Row>
-
     <Row
         android:keyboardMode="@+id/mode_symbols_with_settings_key"
         android:rowEdgeFlags="bottom"
     >
-        <Key android:codes="-2" android:keyLabel="@string/label_alpha_key"
-                android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
-        <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
-                android:iconPreview="@drawable/sym_keyboard_feedback_settings"
-                android:isModifier="true"/>
-        <Key android:codes="@integer/key_f1" android:isModifier="true"/>
-        <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
-                android:keyWidth="30%p"
-                android:iconPreview="@drawable/sym_keyboard_feedback_space"
-                android:isRepeatable="true" android:isModifier="true"/>
-        <Key android:codes="46" android:keyLabel="."
-                android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/>
-        <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:keyWidth="25%p" android:keyEdgeFlags="right"
-                android:iconPreview="@drawable/sym_keyboard_feedback_return"
-                android:isModifier="true"/>
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_alpha_key"
+            android:keyWidth="15%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_settings"
+            android:keyIcon="@drawable/sym_keyboard_settings"
+            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isModifier="true"
+            android:isRepeatable="true" />
+        <Key
+            android:keyLabel="."
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_return"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="25%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
     </Row>
 </Keyboard>