From c9bf5c005eef810d4eac2fd4ee3465ce58736a4c Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Wed, 20 Oct 2010 23:10:27 +0900
Subject: [PATCH] Make common qwerty keyboard layout files and include these

Change-Id: I0cb8de748c4365e42d015078daf686ed76ca105b
---
 java/res/xml-xlarge/kbd_qwerty.xml            | 744 +-----------------
 .../res/xml-xlarge/kbd_qwerty_row1_common.xml |  94 +++
 .../res/xml-xlarge/kbd_qwerty_row2_common.xml |  77 ++
 java/res/xml-xlarge/kbd_qwerty_row2_email.xml |  73 ++
 .../res/xml-xlarge/kbd_qwerty_row3_common.xml |  80 ++
 java/res/xml-xlarge/kbd_qwerty_row3_email.xml |  68 ++
 .../res/xml-xlarge/kbd_qwerty_row4_common.xml |  56 ++
 java/res/xml-xlarge/kbd_qwerty_row4_email.xml |  40 +
 java/res/xml-xlarge/kbd_qwerty_row4_im.xml    |  50 ++
 java/res/xml-xlarge/kbd_qwerty_row4_url.xml   |  48 ++
 10 files changed, 602 insertions(+), 728 deletions(-)
 create mode 100644 java/res/xml-xlarge/kbd_qwerty_row1_common.xml
 create mode 100644 java/res/xml-xlarge/kbd_qwerty_row2_common.xml
 create mode 100644 java/res/xml-xlarge/kbd_qwerty_row2_email.xml
 create mode 100644 java/res/xml-xlarge/kbd_qwerty_row3_common.xml
 create mode 100644 java/res/xml-xlarge/kbd_qwerty_row3_email.xml
 create mode 100644 java/res/xml-xlarge/kbd_qwerty_row4_common.xml
 create mode 100644 java/res/xml-xlarge/kbd_qwerty_row4_email.xml
 create mode 100644 java/res/xml-xlarge/kbd_qwerty_row4_im.xml
 create mode 100644 java/res/xml-xlarge/kbd_qwerty_row4_url.xml

diff --git a/java/res/xml-xlarge/kbd_qwerty.xml b/java/res/xml-xlarge/kbd_qwerty.xml
index 9485ca7b3..6836c2d61 100644
--- a/java/res/xml-xlarge/kbd_qwerty.xml
+++ b/java/res/xml-xlarge/kbd_qwerty.xml
@@ -27,795 +27,83 @@
 >
     <!-- This row is intentionally not marked as a top row -->
     <Row>
-        <Key
-            latin:codes="@integer/key_tab"
-            latin:keyLabel="Tab"
-            latin:keyWidth="7.0%p"
-            latin:isModifier="true"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="q"
-            latin:keyHintIcon="@drawable/key_hint_1_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_q" />
-        <Key
-            latin:keyLabel="w"
-            latin:keyHintIcon="@drawable/key_hint_2_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_w" />
-        <Key
-            latin:keyLabel="e"
-            latin:keyHintIcon="@drawable/key_hint_3_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_e" />
-        <Key
-            latin:keyLabel="r"
-            latin:keyHintIcon="@drawable/key_hint_4_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_r" />
-        <Key
-            latin:keyLabel="t"
-            latin:keyHintIcon="@drawable/key_hint_5_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_t" />
-        <Key
-            latin:keyLabel="y"
-            latin:keyHintIcon="@drawable/key_hint_6_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_y" />
-        <Key
-            latin:keyLabel="u"
-            latin:keyHintIcon="@drawable/key_hint_7_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_u" />
-        <Key
-            latin:keyLabel="i"
-            latin:keyHintIcon="@drawable/key_hint_8_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_i" />
-        <Key
-            latin:keyLabel="o"
-            latin:keyHintIcon="@drawable/key_hint_9_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_o" />
-        <Key
-            latin:keyLabel="p"
-            latin:keyHintIcon="@drawable/key_hint_0_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_p" />
-        <Key
-            latin:keyLabel="="
-            latin:temporaryShiftKeyLabel="+"
-            latin:keyHintIcon="@drawable/key_hint_plus_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="+" />
-        <Key
-            latin:codes="@integer/key_delete"
-            latin:keyIcon="@drawable/sym_keyboard_delete"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_delete"
-            latin:keyWidth="10.5%p"
-            latin:isModifier="true"
-            latin:isRepeatable="true"
-            latin:keyEdgeFlags="right" />
+        <include latin:keyboardLayout="@xml/kbd_qwerty_row1_common" />
     </Row>
     <!-- TODO: We should have new attributes for <Key> to eliminate these excess duplications -->
     <Row
         latin:keyboardMode="@+id/mode_normal"
     >
-        <Key
-            latin:codes="@integer/key_symbol"
-            latin:keyLabel="@string/label_symbol_key"
-            latin:keyWidth="8.75%p"
-            latin:isModifier="true"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="a"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_a" />
-        <Key
-            latin:keyLabel="s"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_s" />
-        <Key
-            latin:keyLabel="d"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_d" />
-        <Key
-            latin:keyLabel="f" />
-        <Key
-            latin:keyLabel="g"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_g" />
-        <Key
-            latin:keyLabel="h" />
-        <Key
-            latin:keyLabel="j" />
-        <Key
-            latin:keyLabel="k" />
-        <Key
-            latin:keyLabel="l"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_l" />
-        <Key
-            latin:keyLabel=";"
-            latin:temporaryShiftKeyLabel=":"
-            latin:keyHintIcon="@drawable/key_hint_colon_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters=":" />
-        <Key
-            latin:keyLabel="\'"
-            latin:temporaryShiftKeyLabel="&quot;"
-            latin:keyHintIcon="@drawable/key_hint_quote_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="&quot;" />
-        <Key
-            latin:codes="@integer/key_return"
-            latin:keyIcon="@drawable/sym_keyboard_return"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_return"
-            latin:keyWidth="8.75%p"
-            latin:isModifier="true"
-            latin:keyEdgeFlags="right" />
+        <include latin:keyboardLayout="@xml/kbd_qwerty_row2_common" />
     </Row>
     <Row
         latin:keyboardMode="@+id/mode_url"
     >
-        <Key
-            latin:codes="@integer/key_symbol"
-            latin:keyLabel="@string/label_symbol_key"
-            latin:keyWidth="8.75%p"
-            latin:isModifier="true"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="a"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_a" />
-        <Key
-            latin:keyLabel="s"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_s" />
-        <Key
-            latin:keyLabel="d"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_d" />
-        <Key
-            latin:keyLabel="f" />
-        <Key
-            latin:keyLabel="g"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_g" />
-        <Key
-            latin:keyLabel="h" />
-        <Key
-            latin:keyLabel="j" />
-        <Key
-            latin:keyLabel="k" />
-        <Key
-            latin:keyLabel="l"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_l" />
-        <Key
-            latin:keyLabel=";"
-            latin:temporaryShiftKeyLabel=":"
-            latin:keyHintIcon="@drawable/key_hint_colon_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters=":" />
-        <Key
-            latin:keyLabel="\'"
-            latin:temporaryShiftKeyLabel="&quot;"
-            latin:keyHintIcon="@drawable/key_hint_quote_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="&quot;" />
-        <Key
-            latin:codes="@integer/key_return"
-            latin:keyIcon="@drawable/sym_keyboard_return"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_return"
-            latin:keyWidth="8.75%p"
-            latin:isModifier="true"
-            latin:keyEdgeFlags="right" />
+        <include latin:keyboardLayout="@xml/kbd_qwerty_row2_common" />
     </Row>
     <Row
         latin:keyboardMode="@+id/mode_email"
     >
-        <Key
-            latin:codes="@integer/key_symbol"
-            latin:keyLabel="@string/label_symbol_key"
-            latin:keyWidth="8.75%p"
-            latin:isModifier="true"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="a"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_a" />
-        <Key
-            latin:keyLabel="s"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_s" />
-        <Key
-            latin:keyLabel="d"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_d" />
-        <Key
-            latin:keyLabel="f" />
-        <Key
-            latin:keyLabel="g"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_g" />
-        <Key
-            latin:keyLabel="h" />
-        <Key
-            latin:keyLabel="j" />
-        <Key
-            latin:keyLabel="k" />
-        <Key
-            latin:keyLabel="l"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_l" />
-        <Key
-            latin:keyLabel=";" />
-        <Key
-            latin:keyLabel="\'"
-            latin:temporaryShiftKeyLabel="&quot;"
-            latin:keyHintIcon="@drawable/key_hint_quote_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="&quot;" />
-        <Key
-            latin:codes="@integer/key_return"
-            latin:keyIcon="@drawable/sym_keyboard_return"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_return"
-            latin:keyWidth="8.75%p"
-            latin:isModifier="true"
-            latin:keyEdgeFlags="right" />
+        <include latin:keyboardLayout="@xml/kbd_qwerty_row2_email" />
     </Row>
     <Row
         latin:keyboardMode="@+id/mode_im"
     >
-        <Key
-            latin:codes="@integer/key_symbol"
-            latin:keyLabel="@string/label_symbol_key"
-            latin:keyWidth="8.75%p"
-            latin:isModifier="true"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="a"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_a" />
-        <Key
-            latin:keyLabel="s"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_s" />
-        <Key
-            latin:keyLabel="d"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_d" />
-        <Key
-            latin:keyLabel="f" />
-        <Key
-            latin:keyLabel="g"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_g" />
-        <Key
-            latin:keyLabel="h" />
-        <Key
-            latin:keyLabel="j" />
-        <Key
-            latin:keyLabel="k" />
-        <Key
-            latin:keyLabel="l"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_l" />
-        <Key
-            latin:keyLabel=";"
-            latin:temporaryShiftKeyLabel=":"
-            latin:keyHintIcon="@drawable/key_hint_colon_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters=":" />
-        <Key
-            latin:keyLabel="\'"
-            latin:temporaryShiftKeyLabel="&quot;"
-            latin:keyHintIcon="@drawable/key_hint_quote_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="&quot;" />
-        <Key
-            latin:codes="@integer/key_return"
-            latin:keyIcon="@drawable/sym_keyboard_return"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_return"
-            latin:keyWidth="8.75%p"
-            latin:isModifier="true"
-            latin:keyEdgeFlags="right" />
+        <include latin:keyboardLayout="@xml/kbd_qwerty_row2_common" />
     </Row>
     <Row
         latin:keyboardMode="@+id/mode_webentry"
     >
-        <Key
-            latin:codes="@integer/key_symbol"
-            latin:keyLabel="@string/label_symbol_key"
-            latin:keyWidth="8.75%p"
-            latin:isModifier="true"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="a"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_a" />
-        <Key
-            latin:keyLabel="s"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_s" />
-        <Key
-            latin:keyLabel="d"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_d" />
-        <Key
-            latin:keyLabel="f" />
-        <Key
-            latin:keyLabel="g"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_g" />
-        <Key
-            latin:keyLabel="h" />
-        <Key
-            latin:keyLabel="j" />
-        <Key
-            latin:keyLabel="k" />
-        <Key
-            latin:keyLabel="l"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_l" />
-        <Key
-            latin:keyLabel=";"
-            latin:temporaryShiftKeyLabel=":"
-            latin:keyHintIcon="@drawable/key_hint_colon_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters=":" />
-        <Key
-            latin:keyLabel="\'"
-            latin:temporaryShiftKeyLabel="&quot;"
-            latin:keyHintIcon="@drawable/key_hint_quote_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="&quot;" />
-        <Key
-            latin:codes="@integer/key_return"
-            latin:keyIcon="@drawable/sym_keyboard_return"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_return"
-            latin:keyWidth="8.75%p"
-            latin:isModifier="true"
-            latin:keyEdgeFlags="right" />
+        <include latin:keyboardLayout="@xml/kbd_qwerty_row2_common" />
     </Row>
     <Row
         latin:keyboardMode="@+id/mode_normal"
     >
-        <Key
-            latin:codes="@integer/key_shift"
-            latin:keyIcon="@drawable/sym_keyboard_shift"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
-            latin:keyWidth="12.5%p"
-            latin:isModifier="true"
-            latin:isSticky="true"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="z"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_z" />
-        <Key
-            latin:keyLabel="x" />
-        <Key
-            latin:keyLabel="c"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_c" />
-        <Key
-            latin:keyLabel="v"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_v" />
-        <Key
-            latin:keyLabel="b" />
-        <Key
-            latin:keyLabel="n"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_n" />
-        <Key
-            latin:keyLabel="m" />
-        <Key
-            latin:keyLabel=","
-            latin:temporaryShiftKeyLabel="*"
-            latin:keyHintIcon="@drawable/key_hint_star_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="*" />
-        <Key
-            latin:keyLabel="."
-            latin:temporaryShiftKeyLabel="!"
-            latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="!" />
-        <Key
-            latin:keyLabel="/"
-            latin:temporaryShiftKeyLabel="\?"
-            latin:keyHintIcon="@drawable/key_hint_question_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="\?" />
-        <Key
-            latin:codes="@integer/key_shift"
-            latin:keyIcon="@drawable/sym_keyboard_shift"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
-            latin:keyWidth="12.5%p"
-            latin:isModifier="true"
-            latin:isSticky="true"
-            latin:keyEdgeFlags="right" />
+        <include latin:keyboardLayout="@xml/kbd_qwerty_row3_common" />
     </Row>
     <Row
         latin:keyboardMode="@+id/mode_url"
     >
-        <Key
-            latin:codes="@integer/key_shift"
-            latin:keyIcon="@drawable/sym_keyboard_shift"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
-            latin:keyWidth="12.5%p"
-            latin:isModifier="true"
-            latin:isSticky="true"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="z"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_z" />
-        <Key
-            latin:keyLabel="x" />
-        <Key
-            latin:keyLabel="c"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_c" />
-        <Key
-            latin:keyLabel="v"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_v" />
-        <Key
-            latin:keyLabel="b" />
-        <Key
-            latin:keyLabel="n"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_n" />
-        <Key
-            latin:keyLabel="m" />
-        <Key
-            latin:keyLabel=","
-            latin:temporaryShiftKeyLabel="*"
-            latin:keyHintIcon="@drawable/key_hint_star_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="*" />
-        <Key
-            latin:keyLabel="."
-            latin:temporaryShiftKeyLabel="!"
-            latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="!" />
-        <Key
-            latin:keyLabel="/"
-            latin:temporaryShiftKeyLabel="\?"
-            latin:keyHintIcon="@drawable/key_hint_question_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="\?" />
-        <Key
-            latin:codes="@integer/key_shift"
-            latin:keyIcon="@drawable/sym_keyboard_shift"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
-            latin:keyWidth="12.5%p"
-            latin:isModifier="true"
-            latin:isSticky="true"
-            latin:keyEdgeFlags="right" />
+        <include latin:keyboardLayout="@xml/kbd_qwerty_row3_common" />
     </Row>
     <Row
         latin:keyboardMode="@+id/mode_email"
     >
-        <Key
-            latin:codes="@integer/key_shift"
-            latin:keyIcon="@drawable/sym_keyboard_shift"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
-            latin:keyWidth="12.5%p"
-            latin:isModifier="true"
-            latin:isSticky="true"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="z"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_z" />
-        <Key
-            latin:keyLabel="x" />
-        <Key
-            latin:keyLabel="c"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_c" />
-        <Key
-            latin:keyLabel="v"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_v" />
-        <Key
-            latin:keyLabel="b" />
-        <Key
-            latin:keyLabel="n"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_n" />
-        <Key
-            latin:keyLabel="m" />
-        <Key
-            latin:keyLabel="," />
-        <Key
-            latin:keyLabel="." />
-        <Key
-            latin:keyLabel="\@" />
-        <Key
-            latin:codes="@integer/key_shift"
-            latin:keyIcon="@drawable/sym_keyboard_shift"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
-            latin:keyWidth="12.5%p"
-            latin:isModifier="true"
-            latin:isSticky="true"
-            latin:keyEdgeFlags="right" />
+        <include latin:keyboardLayout="@xml/kbd_qwerty_row3_email" />
     </Row>
     <Row
         latin:keyboardMode="@+id/mode_im"
     >
-        <Key
-            latin:codes="@integer/key_shift"
-            latin:keyIcon="@drawable/sym_keyboard_shift"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
-            latin:keyWidth="12.5%p"
-            latin:isModifier="true"
-            latin:isSticky="true"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="z"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_z" />
-        <Key
-            latin:keyLabel="x" />
-        <Key
-            latin:keyLabel="c"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_c" />
-        <Key
-            latin:keyLabel="v"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_v" />
-        <Key
-            latin:keyLabel="b" />
-        <Key
-            latin:keyLabel="n"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_n" />
-        <Key
-            latin:keyLabel="m" />
-        <Key
-            latin:keyLabel=","
-            latin:temporaryShiftKeyLabel="*"
-            latin:keyHintIcon="@drawable/key_hint_star_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="*" />
-        <Key
-            latin:keyLabel="."
-            latin:temporaryShiftKeyLabel="!"
-            latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="!" />
-        <Key
-            latin:keyLabel="/"
-            latin:temporaryShiftKeyLabel="\?"
-            latin:keyHintIcon="@drawable/key_hint_question_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="\?" />
-        <Key
-            latin:codes="@integer/key_shift"
-            latin:keyIcon="@drawable/sym_keyboard_shift"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
-            latin:keyWidth="12.5%p"
-            latin:isModifier="true"
-            latin:isSticky="true"
-            latin:keyEdgeFlags="right" />
+        <include latin:keyboardLayout="@xml/kbd_qwerty_row3_common" />
     </Row>
     <Row
         latin:keyboardMode="@+id/mode_webentry"
     >
-        <Key
-            latin:codes="@integer/key_shift"
-            latin:keyIcon="@drawable/sym_keyboard_shift"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
-            latin:keyWidth="12.5%p"
-            latin:isModifier="true"
-            latin:isSticky="true"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="z"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_z" />
-        <Key
-            latin:keyLabel="x" />
-        <Key
-            latin:keyLabel="c"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_c" />
-        <Key
-            latin:keyLabel="v"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_v" />
-        <Key
-            latin:keyLabel="b" />
-        <Key
-            latin:keyLabel="n"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="@string/alternates_for_n" />
-        <Key
-            latin:keyLabel="m" />
-        <Key
-            latin:keyLabel=","
-            latin:temporaryShiftKeyLabel="*"
-            latin:keyHintIcon="@drawable/key_hint_star_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="*" />
-        <Key
-            latin:keyLabel="."
-            latin:temporaryShiftKeyLabel="!"
-            latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="!" />
-        <Key
-            latin:keyLabel="/"
-            latin:temporaryShiftKeyLabel="\?"
-            latin:keyHintIcon="@drawable/key_hint_question_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="\?" />
-        <Key
-            latin:codes="@integer/key_shift"
-            latin:keyIcon="@drawable/sym_keyboard_shift"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
-            latin:keyWidth="12.5%p"
-            latin:isModifier="true"
-            latin:isSticky="true"
-            latin:keyEdgeFlags="right" />
+        <include latin:keyboardLayout="@xml/kbd_qwerty_row3_common" />
     </Row>
     <!-- This row is intentionally not marked as a bottom row -->
     <Row
         latin:keyboardMode="@+id/mode_normal"
     >
-        <Spacer
-            latin:horizontalGap="16.25%p" />
-        <Key
-            latin:keyLabel="("
-            latin:temporaryShiftKeyLabel="&lt;"
-            latin:keyHintIcon="@drawable/key_hint_smaller_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="&lt;" />
-        <Key
-            latin:keyLabel=")"
-            latin:temporaryShiftKeyLabel="&gt;"
-            latin:keyHintIcon="@drawable/key_hint_larger_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="&gt;" />
-        <Key
-            latin:codes="@integer/key_space"
-            latin:keyIcon="@drawable/sym_keyboard_space"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_space"
-            latin:keyWidth="37.5%p"
-            latin:isModifier="true" />
-        <Key
-            latin:keyLabel="_"
-            latin:temporaryShiftKeyLabel="\@"
-            latin:keyHintIcon="@drawable/key_hint_at_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="\@" />
-        <Key
-            latin:keyLabel="-"
-            latin:temporaryShiftKeyLabel="#"
-            latin:keyHintIcon="@drawable/keyboard_hint_doublecross"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="#" />
+        <include latin:keyboardLayout="@xml/kbd_qwerty_row4_common" />
     </Row>
     <Row
         latin:keyboardMode="@+id/mode_url"
     >
-        <Spacer
-            latin:horizontalGap="16.25%p" />
-        <Key
-            latin:keyLabel=".com"
-    	    latin:keyOutputText=".com"
-            latin:keyWidth="15.0%p" />
-        <Key
-            latin:codes="@integer/key_space"
-            latin:keyIcon="@drawable/sym_keyboard_space"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_space"
-            latin:keyWidth="37.5%p"
-            latin:isModifier="true" />
-        <Key
-            latin:keyLabel="_"
-            latin:temporaryShiftKeyLabel="\@"
-            latin:keyHintIcon="@drawable/key_hint_at_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="\@" />
-        <Key
-            latin:keyLabel="-"
-            latin:temporaryShiftKeyLabel="#"
-            latin:keyHintIcon="@drawable/keyboard_hint_doublecross"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="#" />
+        <include latin:keyboardLayout="@xml/kbd_qwerty_row4_url" />
     </Row>
     <Row
         latin:keyboardMode="@+id/mode_email"
     >
-        <Spacer
-            latin:horizontalGap="16.25%p" />
-        <Key
-            latin:keyLabel=".com"
-            latin:keyOutputText=".com"
-            latin:keyWidth="15.0%p" />
-        <Key
-            latin:codes="@integer/key_space"
-            latin:keyIcon="@drawable/sym_keyboard_space"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_space"
-            latin:keyWidth="37.5%p"
-            latin:isModifier="true" />
-        <Key
-            latin:keyLabel="_" />
-        <Key
-            latin:keyLabel="-" />
+        <include latin:keyboardLayout="@xml/kbd_qwerty_row4_email" />
     </Row>
     <Row
         latin:keyboardMode="@+id/mode_im"
     >
-        <Spacer
-            latin:horizontalGap="16.25%p" />
-        <Key
-            latin:keyLabel=":-)"
-            latin:keyOutputText=":-)"
-            latin:popupKeyboard="@xml/popup_smileys"
-            latin:keyWidth="15.0%p" />
-        <Key
-            latin:codes="@integer/key_space"
-            latin:keyIcon="@drawable/sym_keyboard_space"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_space"
-            latin:keyWidth="37.5%p"
-            latin:isModifier="true" />
-        <Key
-            latin:keyLabel="_"
-            latin:temporaryShiftKeyLabel="\@"
-            latin:keyHintIcon="@drawable/key_hint_at_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="\@" />
-        <Key
-            latin:keyLabel="-"
-            latin:temporaryShiftKeyLabel="#"
-            latin:keyHintIcon="@drawable/keyboard_hint_doublecross"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="#" />
+        <include latin:keyboardLayout="@xml/kbd_qwerty_row4_im" />
     </Row>
     <Row
         latin:keyboardMode="@+id/mode_webentry"
     >
-        <Spacer
-            latin:horizontalGap="16.25%p" />
-        <Key
-            latin:keyLabel="("
-            latin:temporaryShiftKeyLabel="&lt;"
-            latin:keyHintIcon="@drawable/key_hint_smaller_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="&lt;" />
-        <Key
-            latin:keyLabel=")"
-            latin:temporaryShiftKeyLabel="&gt;"
-            latin:keyHintIcon="@drawable/key_hint_larger_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="&gt;" />
-        <Key
-            latin:codes="@integer/key_space"
-            latin:keyIcon="@drawable/sym_keyboard_space"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_space"
-            latin:keyWidth="37.5%p"
-            latin:isModifier="true" />
-        <Key
-            latin:keyLabel="_"
-            latin:temporaryShiftKeyLabel="\@"
-            latin:keyHintIcon="@drawable/key_hint_at_holo"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="\@" />
-        <Key
-            latin:keyLabel="-"
-            latin:temporaryShiftKeyLabel="#"
-            latin:keyHintIcon="@drawable/keyboard_hint_doublecross"
-            latin:popupKeyboard="@xml/kbd_popup_template"
-            latin:popupCharacters="#" />
+        <include latin:keyboardLayout="@xml/kbd_qwerty_row4_common" />
     </Row>
 </Keyboard>
diff --git a/java/res/xml-xlarge/kbd_qwerty_row1_common.xml b/java/res/xml-xlarge/kbd_qwerty_row1_common.xml
new file mode 100644
index 000000000..98b857152
--- /dev/null
+++ b/java/res/xml-xlarge/kbd_qwerty_row1_common.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <Key
+        latin:codes="@integer/key_tab"
+        latin:keyLabel="Tab"
+        latin:keyWidth="7.0%p"
+        latin:isModifier="true"
+        latin:keyEdgeFlags="left" />
+    <Key
+        latin:keyLabel="q"
+        latin:keyHintIcon="@drawable/key_hint_1_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_q" />
+    <Key
+        latin:keyLabel="w"
+        latin:keyHintIcon="@drawable/key_hint_2_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_w" />
+    <Key
+        latin:keyLabel="e"
+        latin:keyHintIcon="@drawable/key_hint_3_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_e" />
+    <Key
+        latin:keyLabel="r"
+        latin:keyHintIcon="@drawable/key_hint_4_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_r" />
+    <Key
+        latin:keyLabel="t"
+        latin:keyHintIcon="@drawable/key_hint_5_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_t" />
+    <Key
+        latin:keyLabel="y"
+        latin:keyHintIcon="@drawable/key_hint_6_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_y" />
+    <Key
+        latin:keyLabel="u"
+        latin:keyHintIcon="@drawable/key_hint_7_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_u" />
+    <Key
+        latin:keyLabel="i"
+        latin:keyHintIcon="@drawable/key_hint_8_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_i" />
+    <Key
+        latin:keyLabel="o"
+        latin:keyHintIcon="@drawable/key_hint_9_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_o" />
+    <Key
+        latin:keyLabel="p"
+        latin:keyHintIcon="@drawable/key_hint_0_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_p" />
+    <Key
+        latin:keyLabel="="
+        latin:temporaryShiftKeyLabel="+"
+        latin:keyHintIcon="@drawable/key_hint_plus_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="+" />
+    <Key
+        latin:codes="@integer/key_delete"
+        latin:keyIcon="@drawable/sym_keyboard_delete"
+        latin:iconPreview="@drawable/sym_keyboard_feedback_delete"
+        latin:keyWidth="10.5%p"
+        latin:isModifier="true"
+        latin:isRepeatable="true"
+        latin:keyEdgeFlags="right" />
+</merge>
diff --git a/java/res/xml-xlarge/kbd_qwerty_row2_common.xml b/java/res/xml-xlarge/kbd_qwerty_row2_common.xml
new file mode 100644
index 000000000..907de3cbb
--- /dev/null
+++ b/java/res/xml-xlarge/kbd_qwerty_row2_common.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <Key
+        latin:codes="@integer/key_symbol"
+        latin:keyLabel="@string/label_symbol_key"
+        latin:keyWidth="8.75%p"
+        latin:isModifier="true"
+        latin:keyEdgeFlags="left" />
+    <Key
+        latin:keyLabel="a"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_a" />
+    <Key
+        latin:keyLabel="s"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_s" />
+    <Key
+        latin:keyLabel="d"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_d" />
+    <Key
+        latin:keyLabel="f" />
+    <Key
+        latin:keyLabel="g"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_g" />
+    <Key
+        latin:keyLabel="h" />
+    <Key
+        latin:keyLabel="j" />
+    <Key
+        latin:keyLabel="k" />
+    <Key
+        latin:keyLabel="l"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_l" />
+    <Key
+        latin:keyLabel=";"
+        latin:temporaryShiftKeyLabel=":"
+        latin:keyHintIcon="@drawable/key_hint_colon_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters=":" />
+    <Key
+        latin:keyLabel="\'"
+        latin:temporaryShiftKeyLabel="&quot;"
+        latin:keyHintIcon="@drawable/key_hint_quote_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="&quot;" />
+    <Key
+        latin:codes="@integer/key_return"
+        latin:keyIcon="@drawable/sym_keyboard_return"
+        latin:iconPreview="@drawable/sym_keyboard_feedback_return"
+        latin:keyWidth="8.75%p"
+        latin:isModifier="true"
+        latin:keyEdgeFlags="right" />
+</merge>
diff --git a/java/res/xml-xlarge/kbd_qwerty_row2_email.xml b/java/res/xml-xlarge/kbd_qwerty_row2_email.xml
new file mode 100644
index 000000000..e274537f0
--- /dev/null
+++ b/java/res/xml-xlarge/kbd_qwerty_row2_email.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <Key
+        latin:codes="@integer/key_symbol"
+        latin:keyLabel="@string/label_symbol_key"
+        latin:keyWidth="8.75%p"
+        latin:isModifier="true"
+        latin:keyEdgeFlags="left" />
+    <Key
+        latin:keyLabel="a"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_a" />
+    <Key
+        latin:keyLabel="s"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_s" />
+    <Key
+        latin:keyLabel="d"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_d" />
+    <Key
+        latin:keyLabel="f" />
+    <Key
+        latin:keyLabel="g"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_g" />
+    <Key
+        latin:keyLabel="h" />
+    <Key
+        latin:keyLabel="j" />
+    <Key
+        latin:keyLabel="k" />
+    <Key
+        latin:keyLabel="l"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_l" />
+    <Key
+        latin:keyLabel=";" />
+    <Key
+        latin:keyLabel="\'"
+        latin:temporaryShiftKeyLabel="&quot;"
+        latin:keyHintIcon="@drawable/key_hint_quote_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="&quot;" />
+    <Key
+        latin:codes="@integer/key_return"
+        latin:keyIcon="@drawable/sym_keyboard_return"
+        latin:iconPreview="@drawable/sym_keyboard_feedback_return"
+        latin:keyWidth="8.75%p"
+        latin:isModifier="true"
+        latin:keyEdgeFlags="right" />
+</merge>
diff --git a/java/res/xml-xlarge/kbd_qwerty_row3_common.xml b/java/res/xml-xlarge/kbd_qwerty_row3_common.xml
new file mode 100644
index 000000000..b3fa466f2
--- /dev/null
+++ b/java/res/xml-xlarge/kbd_qwerty_row3_common.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <Key
+        latin:codes="@integer/key_shift"
+        latin:keyIcon="@drawable/sym_keyboard_shift"
+        latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
+        latin:keyWidth="12.5%p"
+        latin:isModifier="true"
+        latin:isSticky="true"
+        latin:keyEdgeFlags="left" />
+    <Key
+        latin:keyLabel="z"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_z" />
+    <Key
+        latin:keyLabel="x" />
+    <Key
+        latin:keyLabel="c"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_c" />
+    <Key
+        latin:keyLabel="v"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_v" />
+    <Key
+        latin:keyLabel="b" />
+    <Key
+        latin:keyLabel="n"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_n" />
+    <Key
+        latin:keyLabel="m" />
+    <Key
+        latin:keyLabel=","
+        latin:temporaryShiftKeyLabel="*"
+        latin:keyHintIcon="@drawable/key_hint_star_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="*" />
+    <Key
+        latin:keyLabel="."
+        latin:temporaryShiftKeyLabel="!"
+        latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="!" />
+    <Key
+        latin:keyLabel="/"
+        latin:temporaryShiftKeyLabel="\?"
+        latin:keyHintIcon="@drawable/key_hint_question_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="\?" />
+    <Key
+        latin:codes="@integer/key_shift"
+        latin:keyIcon="@drawable/sym_keyboard_shift"
+        latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
+        latin:keyWidth="12.5%p"
+        latin:isModifier="true"
+        latin:isSticky="true"
+        latin:keyEdgeFlags="right" />
+</merge>
diff --git a/java/res/xml-xlarge/kbd_qwerty_row3_email.xml b/java/res/xml-xlarge/kbd_qwerty_row3_email.xml
new file mode 100644
index 000000000..d498406c7
--- /dev/null
+++ b/java/res/xml-xlarge/kbd_qwerty_row3_email.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <Key
+        latin:codes="@integer/key_shift"
+        latin:keyIcon="@drawable/sym_keyboard_shift"
+        latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
+        latin:keyWidth="12.5%p"
+        latin:isModifier="true"
+        latin:isSticky="true"
+        latin:keyEdgeFlags="left" />
+    <Key
+        latin:keyLabel="z"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_z" />
+    <Key
+        latin:keyLabel="x" />
+    <Key
+        latin:keyLabel="c"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_c" />
+    <Key
+        latin:keyLabel="v"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_v" />
+    <Key
+        latin:keyLabel="b" />
+    <Key
+        latin:keyLabel="n"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="@string/alternates_for_n" />
+    <Key
+        latin:keyLabel="m" />
+    <Key
+        latin:keyLabel="," />
+    <Key
+        latin:keyLabel="." />
+    <Key
+        latin:keyLabel="\@" />
+    <Key
+        latin:codes="@integer/key_shift"
+        latin:keyIcon="@drawable/sym_keyboard_shift"
+        latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
+        latin:keyWidth="12.5%p"
+        latin:isModifier="true"
+        latin:isSticky="true"
+        latin:keyEdgeFlags="right" />
+</merge>
diff --git a/java/res/xml-xlarge/kbd_qwerty_row4_common.xml b/java/res/xml-xlarge/kbd_qwerty_row4_common.xml
new file mode 100644
index 000000000..63e5a2400
--- /dev/null
+++ b/java/res/xml-xlarge/kbd_qwerty_row4_common.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <Spacer
+        latin:horizontalGap="16.25%p" />
+    <Key
+        latin:keyLabel="("
+        latin:temporaryShiftKeyLabel="&lt;"
+        latin:keyHintIcon="@drawable/key_hint_smaller_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="&lt;" />
+    <Key
+        latin:keyLabel=")"
+        latin:temporaryShiftKeyLabel="&gt;"
+        latin:keyHintIcon="@drawable/key_hint_larger_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="&gt;" />
+    <Key
+        latin:codes="@integer/key_space"
+        latin:keyIcon="@drawable/sym_keyboard_space"
+        latin:iconPreview="@drawable/sym_keyboard_feedback_space"
+        latin:keyWidth="37.5%p"
+        latin:isModifier="true" />
+    <Key
+        latin:keyLabel="_"
+        latin:temporaryShiftKeyLabel="\@"
+        latin:keyHintIcon="@drawable/key_hint_at_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="\@" />
+    <Key
+        latin:keyLabel="-"
+        latin:temporaryShiftKeyLabel="#"
+        latin:keyHintIcon="@drawable/keyboard_hint_doublecross"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="#" />
+</merge>
diff --git a/java/res/xml-xlarge/kbd_qwerty_row4_email.xml b/java/res/xml-xlarge/kbd_qwerty_row4_email.xml
new file mode 100644
index 000000000..c5a5b061b
--- /dev/null
+++ b/java/res/xml-xlarge/kbd_qwerty_row4_email.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <Spacer
+        latin:horizontalGap="16.25%p" />
+    <Key
+        latin:keyLabel=".com"
+        latin:keyOutputText=".com"
+        latin:keyWidth="15.0%p" />
+    <Key
+        latin:codes="@integer/key_space"
+        latin:keyIcon="@drawable/sym_keyboard_space"
+        latin:iconPreview="@drawable/sym_keyboard_feedback_space"
+        latin:keyWidth="37.5%p"
+        latin:isModifier="true" />
+    <Key
+        latin:keyLabel="_" />
+    <Key
+        latin:keyLabel="-" />
+</merge>
diff --git a/java/res/xml-xlarge/kbd_qwerty_row4_im.xml b/java/res/xml-xlarge/kbd_qwerty_row4_im.xml
new file mode 100644
index 000000000..57af2331c
--- /dev/null
+++ b/java/res/xml-xlarge/kbd_qwerty_row4_im.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <Spacer
+        latin:horizontalGap="16.25%p" />
+    <Key
+        latin:keyLabel=":-)"
+        latin:keyOutputText=":-)"
+        latin:keyHintIcon="@drawable/hint_popup"
+        latin:popupKeyboard="@xml/popup_smileys"
+        latin:keyWidth="15.0%p" />
+    <Key
+        latin:codes="@integer/key_space"
+        latin:keyIcon="@drawable/sym_keyboard_space"
+        latin:iconPreview="@drawable/sym_keyboard_feedback_space"
+        latin:keyWidth="37.5%p"
+        latin:isModifier="true" />
+    <Key
+        latin:keyLabel="_"
+        latin:temporaryShiftKeyLabel="\@"
+        latin:keyHintIcon="@drawable/key_hint_at_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="\@" />
+    <Key
+        latin:keyLabel="-"
+        latin:temporaryShiftKeyLabel="#"
+        latin:keyHintIcon="@drawable/keyboard_hint_doublecross"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="#" />
+</merge>
diff --git a/java/res/xml-xlarge/kbd_qwerty_row4_url.xml b/java/res/xml-xlarge/kbd_qwerty_row4_url.xml
new file mode 100644
index 000000000..dd57b88ca
--- /dev/null
+++ b/java/res/xml-xlarge/kbd_qwerty_row4_url.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <Spacer
+        latin:horizontalGap="16.25%p" />
+    <Key
+        latin:keyLabel=".com"
+        latin:keyOutputText=".com"
+        latin:keyWidth="15.0%p" />
+    <Key
+        latin:codes="@integer/key_space"
+        latin:keyIcon="@drawable/sym_keyboard_space"
+        latin:iconPreview="@drawable/sym_keyboard_feedback_space"
+        latin:keyWidth="37.5%p"
+        latin:isModifier="true" />
+    <Key
+        latin:keyLabel="_"
+        latin:temporaryShiftKeyLabel="\@"
+        latin:keyHintIcon="@drawable/key_hint_at_holo"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="\@" />
+    <Key
+        latin:keyLabel="-"
+        latin:temporaryShiftKeyLabel="#"
+        latin:keyHintIcon="@drawable/keyboard_hint_doublecross"
+        latin:popupKeyboard="@xml/kbd_popup_template"
+        latin:popupCharacters="#" />
+</merge>