2 files changed, 527 insertions, 258 deletions
diff --git a/java/res/xml-iw/kbd_qwerty.xml b/java/res/xml-iw/kbd_qwerty.xml
index c6b2056e2..4287abb74 100755
--- a/java/res/xml-iw/kbd_qwerty.xml
+++ b/java/res/xml-iw/kbd_qwerty.xml
@@ -18,148 +18,298 @@
 */
 -->
 
-<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>
-        <Key android:keyLabel="ק" 
-	     android:horizontalGap="5%p"
-	     android:keyEdgeFlags="left"/>
-        <Key android:keyLabel="ר"/>
-        <Key android:keyLabel="א"/>
-        <Key android:keyLabel="ט"/>
-        <Key android:keyLabel="ו"/>
-        <Key android:keyLabel="ן"/>
-        <Key android:keyLabel="ם"/>
-        <Key android:keyLabel="פ"/>
-        <Key android:codes="-5" 
-	     android:horizontalGap="1.25%p"
-	     android:keyIcon="@drawable/sym_keyboard_delete"
-            android:keyWidth="13.75%p" android:keyEdgeFlags="right"
+        <Key
+            android:keyLabel="ק"
+            android:horizontalGap="5%p"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:keyLabel="ר" />
+        <Key
+            android:keyLabel="א" />
+        <Key
+            android:keyLabel="ט" />
+        <Key
+            android:keyLabel="ו" />
+        <Key
+            android:keyLabel="ן" />
+        <Key
+            android:keyLabel="ם" />
+        <Key
+            android:keyLabel="פ" />
+        <Key
+            android:codes="-5"
+            android:horizontalGap="1.25%p"
+            android:keyIcon="@drawable/sym_keyboard_delete"
+            android:keyWidth="13.75%p"
+            android:keyEdgeFlags="right"
             android:iconPreview="@drawable/sym_keyboard_feedback_delete"
-            android:isRepeatable="true" android:isModifier="true"/>
+            android:isRepeatable="true"
+            android:isModifier="true" />
     </Row>
-
     <Row>
-        <Key android:keyLabel="ש" android:keyEdgeFlags="left"/>
-        <Key android:keyLabel="ד"/>
-        <Key android:keyLabel="ג"/>
-        <Key android:keyLabel="כ"/>
-        <Key android:keyLabel="ע"/>
-        <Key android:keyLabel="י"/>
-        <Key android:keyLabel="ח"/>
-        <Key android:keyLabel="ל"/>
-        <Key android:keyLabel="ך"/>
-        <Key android:keyLabel="ף" android:keyEdgeFlags="right"/>
+        <Key
+            android:keyLabel="ש"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:keyLabel="ד" />
+        <Key
+            android:keyLabel="ג" />
+        <Key
+            android:keyLabel="כ" />
+        <Key
+            android:keyLabel="ע" />
+        <Key
+            android:keyLabel="י" />
+        <Key
+            android:keyLabel="ח" />
+        <Key
+            android:keyLabel="ל" />
+        <Key
+            android:keyLabel="ך" />
+        <Key
+            android:keyLabel="ף"
+            android:keyEdgeFlags="right" />
     </Row>
-    
     <Row>
-        <Key android:keyLabel="ז" android:horizontalGap="5%p" android:keyEdgeFlags="left"/>
-        <Key android:keyLabel="ס"/>
-        <Key android:keyLabel="ב"/>
-        <Key android:keyLabel="ה"/>
-        <Key android:keyLabel="נ"/>
-        <Key android:keyLabel="מ"/>
-        <Key android:keyLabel="צ"/>
-        <Key android:keyLabel="ת"/>
-        <Key android:keyLabel="ץ" android:keyEdgeFlags="right"/>
+        <Key
+            android:keyLabel="ז"
+            android:horizontalGap="5%p"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:keyLabel="ס" />
+        <Key
+            android:keyLabel="ב" />
+        <Key
+            android:keyLabel="ה" />
+        <Key
+            android:keyLabel="נ" />
+        <Key
+            android:keyLabel="מ" />
+        <Key
+            android:keyLabel="צ" />
+        <Key
+            android:keyLabel="ת" />
+        <Key
+            android:keyLabel="ץ"
+            android:keyEdgeFlags="right" />
     </Row>
-
-    <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
-        <Key android:codes="-2" android:keyLabel="@string/label_symbol_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:keyWidth="10%p" android:isModifier="true"/>
-        <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
-                android:iconPreview="@drawable/sym_keyboard_feedback_mic"
-                android:keyWidth="10%p" android:isModifier="true"/>
-        <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
-                android:iconPreview="@drawable/sym_keyboard_feedback_space"
-                android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
-        <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" 
-                android:keyWidth="10%p" android:isModifier="true"/>
-        <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
-                android:iconPreview="@drawable/sym_keyboard_feedback_return"
-                android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+    <Row
+        android:keyboardMode="@+id/mode_normal"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="-2"
+            android:keyLabel="@string/label_symbol_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:keyWidth="10%p"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:keyIcon="@drawable/sym_keyboard_mic"
+            android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+            android:keyWidth="10%p"
+            android:isModifier="true" />
+        <Key
+            android:codes="32"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isRepeatable="true"
+            android:isModifier="true" />
+        <Key
+            android:codes="46"
+            android:keyLabel="."
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:keyWidth="10%p"
+            android:isModifier="true" />
+        <Key
+            android:codes="10"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="25%p"
+            android:keyEdgeFlags="right"
+            android:isModifier="true" />
     </Row>
-
-    <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
-        <Key android:codes="-2" android:keyLabel="@string/label_symbol_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:keyWidth="10%p" android:isModifier="true"/>
-        <Key android:keyLabel="/" android:keyWidth="10%p"/>
-        <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
-                android:iconPreview="@drawable/sym_keyboard_feedback_space"
-                android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
-        <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
-                android:keyWidth="10%p" android:isModifier="true"/>
-        <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
-                android:iconPreview="@drawable/sym_keyboard_feedback_return"
-                android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+    <Row
+        android:keyboardMode="@+id/mode_url"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="-2"
+            android:keyLabel="@string/label_symbol_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:keyWidth="10%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="/"
+            android:keyWidth="10%p" />
+        <Key
+            android:codes="32"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isRepeatable="true"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:keyWidth="10%p"
+            android:isModifier="true" />
+        <Key
+            android:codes="10"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="25%p"
+            android:keyEdgeFlags="right"
+            android:isModifier="true" />
     </Row>
-
-    <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
-        <Key android:codes="-2" android:keyLabel="@string/label_symbol_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:keyWidth="10%p" android:isModifier="true"/>
-        <Key android:keyLabel="\@" android:isModifier="true"/>
-        <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
-                android:iconPreview="@drawable/sym_keyboard_feedback_space"
-                android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
-        <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/>
-        <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
-                android:iconPreview="@drawable/sym_keyboard_feedback_return"
-                android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+    <Row
+        android:keyboardMode="@+id/mode_email"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="-2"
+            android:keyLabel="@string/label_symbol_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:keyWidth="10%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="\@"
+            android:isModifier="true" />
+        <Key
+            android:codes="32"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isRepeatable="true"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:codes="10"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="25%p"
+            android:keyEdgeFlags="right"
+            android:isModifier="true" />
     </Row>
-
-    <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
-        <Key android:codes="-2" android:keyLabel="@string/label_symbol_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:keyWidth="10%p" android:isModifier="true"/>
-        <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
-                android:iconPreview="@drawable/sym_keyboard_feedback_mic"
-                android:keyWidth="10%p" android:isModifier="true"/>
-        <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
-                android:iconPreview="@drawable/sym_keyboard_feedback_space"
-                android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
-        <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" 
-                android:keyWidth="10%p" android:isModifier="true"/>
-        <Key android:keyLabel=":-)" android:keyOutputText=":-) "
-                android:popupKeyboard="@xml/popup_smileys"
-                android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+    <Row
+        android:keyboardMode="@+id/mode_im"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="-2"
+            android:keyLabel="@string/label_symbol_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:keyWidth="10%p"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:keyIcon="@drawable/sym_keyboard_mic"
+            android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+            android:keyWidth="10%p"
+            android:isModifier="true" />
+        <Key
+            android:codes="32"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isRepeatable="true"
+            android:isModifier="true" />
+        <Key
+            android:codes="46"
+            android:keyLabel="."
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:keyWidth="10%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel=":-)"
+            android:keyOutputText=":-) "
+            android:popupKeyboard="@xml/popup_smileys"
+            android:keyWidth="25%p"
+            android:keyEdgeFlags="right"
+            android:isModifier="true" />
     </Row>
-
-    <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
-        <Key android:codes="-2" android:keyLabel="@string/label_symbol_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:keyWidth="10%p" android:isModifier="true"/>
-        <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
-                android:iconPreview="@drawable/sym_keyboard_feedback_mic"
-                android:keyWidth="10%p" android:isModifier="true"/>
-        <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
-                android:iconPreview="@drawable/sym_keyboard_feedback_space"
-                android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
-        <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab"
-                android:iconPreview="@drawable/sym_keyboard_feedback_tab"
-                android:keyWidth="10%p" android:isModifier="true"/>
-        <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
-                android:keyWidth="10%p" android:isModifier="true"/>
-        <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
-                android:iconPreview="@drawable/sym_keyboard_feedback_return"
-                android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+    <Row
+        android:keyboardMode="@+id/mode_webentry"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="-2"
+            android:keyLabel="@string/label_symbol_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:keyWidth="10%p"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:keyIcon="@drawable/sym_keyboard_mic"
+            android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+            android:keyWidth="10%p"
+            android:isModifier="true" />
+        <Key
+            android:codes="32"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isRepeatable="true"
+            android:isModifier="true" />
+        <Key
+            android:codes="9"
+            android:keyIcon="@drawable/sym_keyboard_tab"
+            android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+            android:keyWidth="10%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:keyWidth="10%p"
+            android:isModifier="true" />
+        <Key
+            android:codes="10"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="15%p"
+            android:keyEdgeFlags="right"
+            android:isModifier="true" />
     </Row>
-</Keyboard>
-    
+</Keyboard>
+\ No newline at end of file
diff --git a/java/res/xml-iw/kbd_qwerty_black.xml b/java/res/xml-iw/kbd_qwerty_black.xml
index 8b64c82ad..b924e47e2 100755
--- a/java/res/xml-iw/kbd_qwerty_black.xml
+++ b/java/res/xml-iw/kbd_qwerty_black.xml
@@ -18,148 +18,267 @@
 */
 -->
 
-<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>
-        <Key android:keyLabel="ק"
-	     android:horizontalGap="5%p"
-	     android:keyEdgeFlags="left"/>
-        <Key android:keyLabel="ר"/>
-        <Key android:keyLabel="א"/>
-        <Key android:keyLabel="ט"/>
-        <Key android:keyLabel="ו"/>
-        <Key android:keyLabel="ן"/>
-        <Key android:keyLabel="ם"/>
-        <Key android:keyLabel="פ"/>
-        <Key android:codes="-5"
-	     android:horizontalGap="1.25%p"
-	     android:keyIcon="@drawable/sym_bkeyboard_delete"
-            android:keyWidth="13.75%p" android:keyEdgeFlags="right"
+        <Key
+            android:keyLabel="ק"
+            android:horizontalGap="5%p"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:keyLabel="ר" />
+        <Key
+            android:keyLabel="א" />
+        <Key
+            android:keyLabel="ט" />
+        <Key
+            android:keyLabel="ו" />
+        <Key
+            android:keyLabel="ן" />
+        <Key
+            android:keyLabel="ם" />
+        <Key
+            android:keyLabel="פ" />
+        <Key
+            android:codes="-5"
+            android:horizontalGap="1.25%p"
+            android:keyIcon="@drawable/sym_bkeyboard_delete"
+            android:keyWidth="13.75%p"
+            android:keyEdgeFlags="right"
             android:iconPreview="@drawable/sym_keyboard_feedback_delete"
-            android:isRepeatable="true"/>
+            android:isRepeatable="true" />
     </Row>
-
     <Row>
-        <Key android:keyLabel="ש" android:keyEdgeFlags="left"/>
-        <Key android:keyLabel="ד"/>
-        <Key android:keyLabel="ג"/>
-        <Key android:keyLabel="כ"/>
-        <Key android:keyLabel="ע"/>
-        <Key android:keyLabel="י"/>
-        <Key android:keyLabel="ח"/>
-        <Key android:keyLabel="ל"/>
-        <Key android:keyLabel="ך"/>
-        <Key android:keyLabel="ף" android:keyEdgeFlags="right"/>
+        <Key
+            android:keyLabel="ש"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:keyLabel="ד" />
+        <Key
+            android:keyLabel="ג" />
+        <Key
+            android:keyLabel="כ" />
+        <Key
+            android:keyLabel="ע" />
+        <Key
+            android:keyLabel="י" />
+        <Key
+            android:keyLabel="ח" />
+        <Key
+            android:keyLabel="ל" />
+        <Key
+            android:keyLabel="ך" />
+        <Key
+            android:keyLabel="ף"
+            android:keyEdgeFlags="right" />
     </Row>
-
     <Row>
-        <Key android:keyLabel="ז" android:horizontalGap="5%p" android:keyEdgeFlags="left"/>
-        <Key android:keyLabel="ס"/>
-        <Key android:keyLabel="ב"/>
-        <Key android:keyLabel="ה"/>
-        <Key android:keyLabel="נ"/>
-        <Key android:keyLabel="מ"/>
-        <Key android:keyLabel="צ"/>
-        <Key android:keyLabel="ת"/>
-        <Key android:keyLabel="ץ" android:keyEdgeFlags="right"/>
+        <Key
+            android:keyLabel="ז"
+            android:horizontalGap="5%p"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:keyLabel="ס" />
+        <Key
+            android:keyLabel="ב" />
+        <Key
+            android:keyLabel="ה" />
+        <Key
+            android:keyLabel="נ" />
+        <Key
+            android:keyLabel="מ" />
+        <Key
+            android:keyLabel="צ" />
+        <Key
+            android:keyLabel="ת" />
+        <Key
+            android:keyLabel="ץ"
+            android:keyEdgeFlags="right" />
     </Row>
-
-    <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
-        <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:keyWidth="15%p" android:keyEdgeFlags="left"/>
-        <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
-                android:iconPreview="@drawable/sym_keyboard_feedback_settings"
-                android:keyWidth="10%p"/>
-        <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
-                android:iconPreview="@drawable/sym_keyboard_feedback_mic"
-                android:keyWidth="10%p"/>
-        <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
-                android:iconPreview="@drawable/sym_keyboard_feedback_space"
-                android:keyWidth="30%p" android:isRepeatable="true"/>
-        <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
-                android:keyWidth="10%p"/>
-        <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
-                android:iconPreview="@drawable/sym_keyboard_feedback_return"
-                android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+    <Row
+        android:keyboardMode="@+id/mode_normal"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="-2"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="15%p"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_settings"
+            android:keyIcon="@drawable/sym_bkeyboard_settings"
+            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+            android:keyWidth="10%p" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:keyIcon="@drawable/sym_bkeyboard_mic"
+            android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+            android:keyWidth="10%p" />
+        <Key
+            android:codes="32"
+            android:keyIcon="@drawable/sym_bkeyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isRepeatable="true" />
+        <Key
+            android:codes="46"
+            android:keyLabel="."
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:keyWidth="10%p" />
+        <Key
+            android:codes="10"
+            android:keyIcon="@drawable/sym_bkeyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="25%p"
+            android:keyEdgeFlags="right" />
     </Row>
-
-    <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
-        <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:keyWidth="15%p" android:keyEdgeFlags="left"/>
-        <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
-                android:iconPreview="@drawable/sym_keyboard_feedback_settings"
-                android:keyWidth="10%p"/>
-        <Key android:keyLabel="/" android:keyWidth="10%p"/>
-        <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
-                android:iconPreview="@drawable/sym_keyboard_feedback_space"
-                android:keyWidth="30%p" android:isRepeatable="true"/>
-        <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
-                android:keyWidth="10%p"/>
-        <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
-                android:iconPreview="@drawable/sym_keyboard_feedback_return"
-                android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+    <Row
+        android:keyboardMode="@+id/mode_url"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="-2"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="15%p"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_settings"
+            android:keyIcon="@drawable/sym_bkeyboard_settings"
+            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+            android:keyWidth="10%p" />
+        <Key
+            android:keyLabel="/"
+            android:keyWidth="10%p" />
+        <Key
+            android:codes="32"
+            android:keyIcon="@drawable/sym_bkeyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isRepeatable="true" />
+        <Key
+            android:keyLabel="."
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:keyWidth="10%p" />
+        <Key
+            android:codes="10"
+            android:keyIcon="@drawable/sym_bkeyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="25%p"
+            android:keyEdgeFlags="right" />
     </Row>
-
-    <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
-        <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:keyWidth="15%p" android:keyEdgeFlags="left"/>
-        <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
-                android:iconPreview="@drawable/sym_keyboard_feedback_settings"
-                android:keyWidth="10%p"/>
-        <Key android:keyLabel="\@"/>
-        <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
-                android:iconPreview="@drawable/sym_keyboard_feedback_space"
-                android:keyWidth="30%p" android:isRepeatable="true"/>
-        <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
-        <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
-                android:iconPreview="@drawable/sym_keyboard_feedback_return"
-                android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+    <Row
+        android:keyboardMode="@+id/mode_email"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="-2"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="15%p"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_settings"
+            android:keyIcon="@drawable/sym_bkeyboard_settings"
+            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+            android:keyWidth="10%p" />
+        <Key
+            android:keyLabel="\@" />
+        <Key
+            android:codes="32"
+            android:keyIcon="@drawable/sym_bkeyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isRepeatable="true" />
+        <Key
+            android:keyLabel="."
+            android:popupKeyboard="@xml/popup_punctuation" />
+        <Key
+            android:codes="10"
+            android:keyIcon="@drawable/sym_bkeyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="25%p"
+            android:keyEdgeFlags="right" />
     </Row>
-
-    <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
-        <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:keyWidth="15%p" android:keyEdgeFlags="left"/>
-        <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
-                android:iconPreview="@drawable/sym_keyboard_feedback_settings"
-                android:keyWidth="10%p"/>
-        <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
-                android:iconPreview="@drawable/sym_keyboard_feedback_mic"
-                android:keyWidth="10%p"/>
-        <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
-                android:iconPreview="@drawable/sym_keyboard_feedback_space"
-                android:keyWidth="30%p" android:isRepeatable="true"/>
-        <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
-                android:keyWidth="10%p"/>
-        <Key android:keyLabel=":-)" android:keyOutputText=":-) "
-                android:popupKeyboard="@xml/popup_smileys"
-                android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+    <Row
+        android:keyboardMode="@+id/mode_im"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="-2"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="15%p"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_settings"
+            android:keyIcon="@drawable/sym_bkeyboard_settings"
+            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+            android:keyWidth="10%p" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:keyIcon="@drawable/sym_bkeyboard_mic"
+            android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+            android:keyWidth="10%p" />
+        <Key
+            android:codes="32"
+            android:keyIcon="@drawable/sym_bkeyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isRepeatable="true" />
+        <Key
+            android:codes="46"
+            android:keyLabel="."
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:keyWidth="10%p" />
+        <Key
+            android:keyLabel=":-)"
+            android:keyOutputText=":-) "
+            android:popupKeyboard="@xml/popup_smileys"
+            android:keyWidth="25%p"
+            android:keyEdgeFlags="right" />
     </Row>
-
-    <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
-        <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:keyWidth="15%p" android:keyEdgeFlags="left"/>
-        <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
-                android:iconPreview="@drawable/sym_keyboard_feedback_settings"
-                android:keyWidth="10%p"/>
-        <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
-                android:iconPreview="@drawable/sym_keyboard_feedback_mic"
-                android:keyWidth="10%p"/>
-        <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
-                android:iconPreview="@drawable/sym_keyboard_feedback_space"
-                android:keyWidth="30%p" android:isRepeatable="true"/>
-        <Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab"
-                android:iconPreview="@drawable/sym_keyboard_feedback_tab"
-                android:keyWidth="10%p"/>
-        <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
-                android:keyWidth="10%p"/>
-        <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
-                android:iconPreview="@drawable/sym_keyboard_feedback_return"
-                android:keyWidth="15%p" android:keyEdgeFlags="right"/>
+    <Row
+        android:keyboardMode="@+id/mode_webentry"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="-2"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="15%p"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_settings"
+            android:keyIcon="@drawable/sym_bkeyboard_settings"
+            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+            android:keyWidth="10%p" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:keyIcon="@drawable/sym_bkeyboard_mic"
+            android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+            android:keyWidth="10%p" />
+        <Key
+            android:codes="32"
+            android:keyIcon="@drawable/sym_bkeyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isRepeatable="true" />
+        <Key
+            android:codes="9"
+            android:keyIcon="@drawable/sym_bkeyboard_tab"
+            android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+            android:keyWidth="10%p" />
+        <Key
+            android:keyLabel="."
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:keyWidth="10%p" />
+        <Key
+            android:codes="10"
+            android:keyIcon="@drawable/sym_bkeyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="15%p"
+            android:keyEdgeFlags="right" />
     </Row>
-</Keyboard>
-
+</Keyboard>
+\ No newline at end of file