Adaptive keyboard width/position parser (DO NOT MERGE)

This change introduces the following features to Keyboard XML format.

 * "keyXPos" can specify the key X coordinate directly.
 * "keyXPos" can be negative. The X coordinate will be calcluated from
    the right edge of the keyboard toward left.
 * "keyWidth" can be zero to be filled up to the right side.
 * "keyWidth can be negative. The key will be filled up to both sides.
 * Spacer's horizontalGap is renamed as keyWidth, and can be inherited
   from key-style.
 * Spacer can have keyXPos attribute.

Using these syntax, all keyboard layouts have been re-written.

Bug: 4442045
Change-Id: I314b2e8ca2aa145ff9506cbf927140a15685af42

17 files changed, 451 insertions, 487 deletions

diff --git a/java/res/xml-sw600dp/kbd_azerty_rows.xml b/java/res/xml-sw600dp/kbd_azerty_rows.xml
index 5ad11470e..3d57ae715 100644
--- a/java/res/xml-sw600dp/kbd_azerty_rows.xml
+++ b/java/res/xml-sw600dp/kbd_azerty_rows.xml
@@ -24,7 +24,7 @@
     <include
         latin:keyboardLayout="@xml/kbd_key_styles" />
     <Row
-        latin:keyWidth="10%p"
+        latin:keyWidth="9.0%p"
         latin:rowEdgeFlags="top"
     >
         <Key
@@ -67,11 +67,15 @@
         <Key
             latin:keyLabel="p"
             latin:keyHintIcon="@drawable/key_hint_num0_holo"
-            latin:popupCharacters="@string/alternates_for_p"
+            latin:popupCharacters="@string/alternates_for_p" />
+        <Key
+            latin:keyStyle="deleteKeyStyle"
+            latin:keyXPos="-10.0%p"
+            latin:keyWidth="-10.0%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row
-        latin:keyWidth="10%p"
+        latin:keyWidth="9.0%p"
     >
         <Key
             latin:keyLabel="q"
@@ -99,15 +103,19 @@
             latin:keyLabel="l"
             latin:popupCharacters="@string/alternates_for_l" />
         <Key
-            latin:keyLabel="m"
+            latin:keyLabel="m" />
+        <Key
+            latin:keyStyle="returnKeyStyle"
+            latin:keyXPos="-14.6%p"
+            latin:keyWidth="-14.6%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row
-        latin:keyWidth="10%p"
+        latin:keyWidth="8.9%p"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
+            latin:keyWidth="11.1%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="w"
@@ -116,7 +124,6 @@
             latin:keyLabel="x" />
         <Key
             latin:keyLabel="c"
-
             latin:popupCharacters="@string/alternates_for_c" />
         <Key
             latin:keyLabel="v"
@@ -128,11 +135,33 @@
             latin:popupCharacters="@string/alternates_for_n" />
         <Key
             latin:keyLabel="\'" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="15%p"
-            latin:keyEdgeFlags="right" />
-    </Row>
+        <switch>
+            <case
+                latin:mode="email"
+            >
+                <Key
+                    latin:keyLabel="," />
+                <Key
+                    latin:keyLabel="." />
+            </case>
+            <default>
+                <Key
+                    latin:keyLabel=","
+                    latin:manualTemporaryUpperCaseCode="33"
+                    latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
+                    latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo"
+                    latin:popupCharacters="!" />
+                <Key
+                    latin:keyLabel="."
+                    latin:manualTemporaryUpperCaseCode="63"
+                    latin:keyHintIcon="@drawable/key_hint_question_holo"
+                    latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo"
+                    latin:popupCharacters="\?" />
+            </default>
+        </switch>
+        <include
+            latin:keyboardLayout="@xml/kbd_row3_right" />
+   </Row>
     <include
         latin:keyboardLayout="@xml/kbd_qwerty_row4" />
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml
index 6be6a2c30..0612cfd62 100644
--- a/java/res/xml-sw600dp/kbd_key_styles.xml
+++ b/java/res/xml-sw600dp/kbd_key_styles.xml
@@ -23,7 +23,7 @@
 >
     <!-- Base key style for the functional key -->
     <switch>
-       <case
+        <case
             latin:colorScheme="white"
         >
             <key-style
@@ -37,38 +37,6 @@
                 latin:styleName="functionalKeyStyle" />
         </case>
     </switch>
-    <!-- Base key style for the key which may have settings key as popup key -->
-    <switch>
-        <case
-            latin:hasSettingsKey="true"
-        >
-            <key-style
-                latin:styleName="settingsPopupStyle"
-                latin:parentStyle="functionalKeyStyle" />
-            <key-style
-                latin:styleName="webTabKeyStyle"
-                latin:code="@integer/key_tab"
-                latin:keyIcon="@drawable/sym_keyboard_tab_holo"
-                latin:iconPreview="@drawable/sym_keyboard_tab_holo"
-                latin:keyHintIcon="@drawable/hint_popup_holo"
-                latin:popupCharacters="\@drawable/sym_keyboard_settings|\@integer/key_settings"
-                latin:parentStyle="functionalKeyStyle" />
-          </case>
-        <!-- latin:hasSettingsKey="false" -->
-        <default>
-            <key-style
-                latin:styleName="settingsPopupStyle"
-                latin:keyHintIcon="@drawable/hint_popup_holo"
-                latin:popupCharacters="\@drawable/sym_keyboard_settings|\@integer/key_settings"
-                latin:parentStyle="functionalKeyStyle" />
-            <key-style
-                latin:styleName="webTabKeyStyle"
-                latin:code="@integer/key_tab"
-                latin:keyIcon="@drawable/sym_keyboard_tab_holo"
-                latin:iconPreview="@drawable/sym_keyboard_tab_holo"
-                latin:parentStyle="functionalKeyStyle" />
-        </default>
-    </switch>
     <!-- Functional key styles -->
     <switch>
         <case
@@ -110,18 +78,28 @@
                 latin:keyHintIcon="@drawable/hint_popup_holo"
                 latin:popupCharacters="@string/alternates_for_smiley"
                 latin:maxPopupKeyboardColumn="5" />
-            <key-style
-                latin:styleName="settingsKeyStyle"
-                latin:code="@integer/key_settings"
-                latin:keyIcon="@drawable/sym_keyboard_settings_holo"
-                latin:iconPreview="@drawable/sym_keyboard_feedback_settings"
-                latin:parentStyle="functionalKeyStyle" />
-            <key-style
-                latin:styleName="micKeyStyle"
-                latin:code="@integer/key_voice"
-                latin:keyIcon="@drawable/sym_keyboard_voice_holo"
-                latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
-                latin:parentStyle="settingsPopupStyle" />
+            <switch>
+                <case
+                    latin:voiceKeyEnabled="true"
+                >
+                    <key-style
+                        latin:styleName="micOrSettingsKeyStyle"
+                        latin:code="@integer/key_voice"
+                        latin:keyIcon="@drawable/sym_keyboard_voice_holo"
+                        latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
+                        latin:keyHintIcon="@drawable/hint_popup_holo"
+                        latin:popupCharacters="\@drawable/sym_keyboard_settings|\@integer/key_settings"
+                        latin:parentStyle="functionalKeyStyle" />
+                </case>
+                <default>
+                    <key-style
+                        latin:styleName="micOrSettingsKeyStyle"
+                        latin:code="@integer/key_settings"
+                        latin:keyIcon="@drawable/sym_keyboard_settings_holo"
+                        latin:iconPreview="@drawable/sym_keyboard_feedback_settings"
+                        latin:parentStyle="functionalKeyStyle" />
+                </default>
+            </switch>
         </case>
         <case
             latin:colorScheme="black"
@@ -162,21 +140,37 @@
                 latin:keyHintIcon="@drawable/hint_popup_holo"
                 latin:popupCharacters="@string/alternates_for_smiley"
                 latin:maxPopupKeyboardColumn="5" />
-            <key-style
-                latin:styleName="settingsKeyStyle"
-                latin:code="@integer/key_settings"
-                latin:keyIcon="@drawable/sym_bkeyboard_settings"
-                latin:iconPreview="@drawable/sym_keyboard_feedback_settings"
-                latin:parentStyle="functionalKeyStyle" />
-            <key-style
-                latin:styleName="micKeyStyle"
-                latin:code="@integer/key_voice"
-                latin:keyIcon="@drawable/sym_bkeyboard_mic"
-                latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
-                latin:parentStyle="settingsPopupStyle" />
+            <switch>
+                <case
+                    latin:voiceKeyEnabled="true"
+                >
+                    <key-style
+                        latin:styleName="micOrSettingsKeyStyle"
+                        latin:code="@integer/key_voice"
+                        latin:keyIcon="@drawable/sym_bkeyboard_mic"
+                        latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
+                        latin:keyHintIcon="@drawable/hint_popup_holo"
+                        latin:popupCharacters="\@drawable/sym_keyboard_settings|\@integer/key_settings"
+                        latin:parentStyle="functionalKeyStyle" />
+                </case>
+                <default>
+                    <key-style
+                        latin:styleName="micOrSettingsKeyStyle"
+                        latin:code="@integer/key_settings"
+                        latin:keyIcon="@drawable/sym_bkeyboard_settings"
+                        latin:iconPreview="@drawable/sym_keyboard_feedback_settings"
+                        latin:parentStyle="functionalKeyStyle" />
+                </default>
+            </switch>
         </case>
     </switch>
     <key-style
+        latin:styleName="tabKeyStyle"
+        latin:code="@integer/key_tab"
+        latin:keyLabel="@string/label_tab_key"
+        latin:keyLabelOption="fontNormal"
+        latin:parentStyle="functionalKeyStyle" />
+    <key-style
         latin:styleName="toSymbolKeyStyle"
         latin:code="@integer/key_switch_alpha_symbol"
         latin:keyLabel="@string/label_to_symbol_key"
diff --git a/java/res/xml-sw600dp/kbd_number.xml b/java/res/xml-sw600dp/kbd_number.xml
index 4af621d86..80391ed03 100644
--- a/java/res/xml-sw600dp/kbd_number.xml
+++ b/java/res/xml-sw600dp/kbd_number.xml
@@ -23,7 +23,7 @@
     latin:keyboardHeight="@dimen/keyboardHeight"
     latin:maxKeyboardHeight="50%p"
     latin:rowHeight="25%p"
-    latin:keyWidth="13.7%p"
+    latin:keyWidth="12.7%p"
     latin:horizontalGap="@dimen/key_horizontal_gap"
     latin:verticalGap="@dimen/key_bottom_gap"
     latin:popupKeyboardTemplate="@xml/kbd_popup_template"
@@ -39,71 +39,68 @@
         >
             <!-- This row is intentionally not marked as a top row -->
             <Row>
-                <Spacer
-                    latin:horizontalGap="29.5%p" />
                 <Key
-                    latin:keyStyle="num1KeyStyle" />
+                    latin:keyStyle="num1KeyStyle"
+                    latin:keyXPos="29.5%p" />
                 <Key
                     latin:keyStyle="num2KeyStyle" />
                 <Key
                     latin:keyStyle="num3KeyStyle" />
-                <Spacer
-                    latin:horizontalGap="20.3%p" />
                 <Key
                     latin:keyStyle="deleteKeyStyle"
-                    latin:keyWidth="9.2%p"
+                    latin:keyXPos="-10.0%p"
+                    latin:keyWidth="0%p"
                     latin:keyEdgeFlags="right" />
             </Row>
             <Row>
-                <Spacer
-                    latin:horizontalGap="29.5%p" />
                 <Key
-                    latin:keyStyle="num4KeyStyle" />
+                    latin:keyStyle="num4KeyStyle"
+                    latin:keyXPos="29.5%p" />
                 <Key
                     latin:keyStyle="num5KeyStyle" />
                 <Key
                     latin:keyStyle="num6KeyStyle" />
-                <Spacer
-                    latin:horizontalGap="14.8%p" />
                 <Key
                     latin:keyStyle="returnKeyStyle"
-                    latin:keyWidth="14.6%p"
+                    latin:keyXPos="-14.6%p"
+                    latin:keyWidth="0%p"
                     latin:keyEdgeFlags="right" />
             </Row>
             <Row>
-                <Spacer
-                    latin:horizontalGap="29.5%p" />
                 <Key
-                    latin:keyStyle="num7KeyStyle" />
+                    latin:keyStyle="num7KeyStyle"
+                    latin:keyXPos="29.5%p" />
                 <Key
                     latin:keyStyle="num8KeyStyle" />
                 <Key
                     latin:keyStyle="num9KeyStyle" />
-                <!-- There is an empty area below the "Enter" key and right of the "9" key. To
-                     ignore the touch event on the area, "9" is intentionally not marked as a right
-                     edge key. -->
             </Row>
             <!-- This row is intentionally not marked as a bottom row -->
             <Row>
+                <Key
+                    latin:keyStyle="tabKeyStyle"
+                    latin:keyWidth="10.0%p"
+                    latin:keyEdgeFlags="left" />
                 <Spacer
-                    latin:horizontalGap="43.2%p" />
+                    latin:keyXPos="29.5%p" />
                 <Key
                     latin:keyStyle="num0KeyStyle" />
-                <Spacer
-                    latin:horizontalGap="30.2%p" />
-                <include
-                    latin:keyboardLayout="@xml/kbd_settings" />
+                <Spacer />
+                <Key
+                    latin:keyStyle="micOrSettingsKeyStyle"
+                    latin:keyXPos="-10.0%p"
+                    latin:keyWidth="0.0%p"
+                    latin:keyEdgeFlags="right" />
             </Row>
         </case>
         <!-- latin:passwordInput="false" -->
         <default>
             <!-- This row is intentionally not marked as a top row -->
             <Row>
-                <Spacer
-                    latin:horizontalGap="10.0%p" />
                 <Key
                     latin:code="45"
                     latin:keyLabel="-"
+                    latin:keyXPos="14.5%p"
                     latin:keyWidth="9.1%p" />
                 <Key
                     latin:code="43"
@@ -113,27 +110,24 @@
                     latin:code="44"
                     latin:keyLabel="."
                     latin:keyWidth="9.1%p" />
-                <Spacer
-                    latin:horizontalGap="4.5%p" />
                 <Key
-                    latin:keyLabel="1" />
+                    latin:keyLabel="1"
+                    latin:keyXPos="43.3%p" />
                 <Key
                     latin:keyLabel="2" />
                 <Key
                     latin:keyLabel="3" />
-                <Spacer
-                    latin:horizontalGap="8.1%p" />
                 <Key
                     latin:keyStyle="deleteKeyStyle"
-                    latin:keyWidth="9.2%p"
+                    latin:keyXPos="-10.0%p"
+                    latin:keyWidth="0%p"
                     latin:keyEdgeFlags="right" />
             </Row>
             <Row>
-                <Spacer
-                    latin:horizontalGap="10.0%p" />
                 <Key
                     latin:code="44"
                     latin:keyLabel="*"
+                    latin:keyXPos="14.5%p"
                     latin:keyWidth="9.1%p" />
                 <Key
                     latin:code="46"
@@ -143,33 +137,27 @@
                     latin:code="59"
                     latin:keyLabel=","
                     latin:keyWidth="9.1%p" />
-                <Spacer
-                    latin:horizontalGap="4.5%p" />
                 <Key
                     latin:keyLabel="4"
-                    latin:keyWidth="13.7%p" />
+                    latin:keyXPos="43.3%p" />
                 <Key
                     latin:keyLabel="5" />
                 <Key
                     latin:keyLabel="6" />
-                <Spacer
-                    latin:horizontalGap="2.6%p" />
                 <Key
                     latin:keyStyle="returnKeyStyle"
-                    latin:keyWidth="14.6%p"
+                    latin:keyXPos="-14.6%p"
+                    latin:keyWidth="0%p"
                     latin:keyEdgeFlags="right" />
             </Row>
             <Row>
-                <Key
-                    latin:keyStyle="moreKeyStyle"
-                    latin:keyWidth="10.0%p"
-                    latin:keyEdgeFlags="left" />
                 <!-- There is an empty area below the "More" key and left of the "(" key. To
                      ignore the touch event on the area, "(" is intentionally not marked as a left
                      edge key. -->
                 <Key
                     latin:code="40"
                     latin:keyLabel="("
+                    latin:keyXPos="14.5%p"
                     latin:keyWidth="9.1%p" />
                 <Key
                     latin:code="41"
@@ -179,40 +167,36 @@
                     latin:code="78"
                     latin:keyLabel="="
                     latin:keyWidth="9.1%p" />
-                <Spacer
-                    latin:horizontalGap="4.5%p" />
                 <Key
-                    latin:keyLabel="7" />
+                    latin:keyLabel="7"
+                    latin:keyXPos="43.3%p" />
                 <Key
                     latin:keyLabel="8" />
                 <Key
                     latin:keyLabel="9" />
-                <!-- There is an empty area below the "Enter" key and right of the "9" key. To
-                     ignore the touch event on the area, "9" is intentionally not marked as a right
-                     edge key. -->
             </Row>
             <!-- This row is intentionally not marked as a bottom row -->
             <Row>
-                <Spacer
-                    latin:horizontalGap="10.0%p" />
-                <!-- There is an empty area below the "More" key and left of the "space" key. To
-                     ignore the touch event on the area, "space" is intentionally not marked as a
-                     left edge key. -->
+                <Key
+                    latin:keyStyle="tabKeyStyle"
+                    latin:keyWidth="10.0%p"
+                    latin:keyEdgeFlags="left" />
                 <Key
                     latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
+                    latin:keyXPos="14.5%p"
                     latin:keyWidth="27.2%p" />
-                <Spacer
-                    latin:horizontalGap="4.5%p" />
                 <Key
-                    latin:keyLabel="*" />
+                    latin:keyLabel="*"
+                    latin:keyXPos="43.3%p" />
                 <Key
                     latin:keyLabel="0" />
                 <Key
                     latin:keyLabel="#" />
-                <Spacer
-                    latin:horizontalGap="4.3%p" />
-                <include
-                    latin:keyboardLayout="@xml/kbd_settings" />
+                <Key
+                    latin:keyStyle="micOrSettingsKeyStyle"
+                    latin:keyXPos="-10.0%p"
+                    latin:keyWidth="0.0%p"
+                    latin:keyEdgeFlags="right" />
             </Row>
         </default>
     </switch>
diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml
index f77fc7e43..d13fa851d 100644
--- a/java/res/xml-sw600dp/kbd_phone.xml
+++ b/java/res/xml-sw600dp/kbd_phone.xml
@@ -23,7 +23,7 @@
     latin:keyboardHeight="@dimen/keyboardHeight"
     latin:maxKeyboardHeight="50%p"
     latin:rowHeight="25%p"
-    latin:keyWidth="13.7%p"
+    latin:keyWidth="12.7%p"
     latin:horizontalGap="@dimen/key_horizontal_gap"
     latin:verticalGap="@dimen/key_bottom_gap"
     latin:popupKeyboardTemplate="@xml/kbd_popup_template"
@@ -35,55 +35,49 @@
         latin:keyboardLayout="@xml/kbd_numkey_styles" />
     <!-- This row is intentionally not marked as a top row -->
     <Row>
-        <Spacer
-            latin:horizontalGap="14.5%p" />
         <Key
             latin:code="45"
             latin:keyLabel=" - "
+            latin:keyXPos="19.0%p"
             latin:keyWidth="9.1%p" />
         <Key
             latin:code="43"
             latin:keyLabel=" + "
             latin:keyWidth="9.1%p" />
-        <Spacer
-            latin:horizontalGap="9.1%p" />
         <Key
-            latin:keyStyle="num1KeyStyle" />
+            latin:keyStyle="num1KeyStyle"
+            latin:keyXPos="43.3%p" />
         <Key
             latin:keyStyle="num2KeyStyle" />
         <Key
             latin:keyStyle="num3KeyStyle" />
-        <Spacer
-            latin:horizontalGap="8.1%p" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="9.2%p"
+            latin:keyXPos="-10.0%p"
+            latin:keyWidth="0%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row>
-        <Spacer
-            latin:horizontalGap="14.5%p" />
         <Key
             latin:code="44"
             latin:keyLabel=" , "
+            latin:keyXPos="19.0%p"
             latin:keyWidth="9.1%p" />
         <Key
             latin:code="46"
             latin:keyLabel=" . "
             latin:keyWidth="9.1%p" />
-        <Spacer
-            latin:horizontalGap="9.1%p" />
         <Key
-            latin:keyStyle="num4KeyStyle" />
+            latin:keyStyle="num4KeyStyle"
+            latin:keyXPos="43.3%p" />
         <Key
             latin:keyStyle="num5KeyStyle" />
         <Key
             latin:keyStyle="num6KeyStyle" />
-        <Spacer
-            latin:horizontalGap="2.6%p" />
         <Key
             latin:keyStyle="returnKeyStyle"
-            latin:keyWidth="14.6%p"
+            latin:keyXPos="-14.6%p"
+            latin:keyWidth="0%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row>
@@ -91,52 +85,46 @@
             latin:keyStyle="moreKeyStyle"
             latin:keyWidth="10.0%p"
             latin:keyEdgeFlags="left" />
-        <Spacer
-            latin:horizontalGap="4.5%p" />
         <!-- There is an empty area below the "More" key and left of the "(" key.  To ignore
              the touch event on the area, "(" is intentionally not marked as a left edge key. -->
         <Key
             latin:code="40"
             latin:keyLabel=" ( "
+            latin:keyXPos="19.0%p"
             latin:keyWidth="9.1%p" />
         <Key
             latin:code="41"
             latin:keyLabel=" ) "
             latin:keyWidth="9.1%p" />
-        <Spacer
-            latin:horizontalGap="9.1%p" />
         <Key
-            latin:keyStyle="num7KeyStyle" />
+            latin:keyStyle="num7KeyStyle"
+            latin:keyXPos="43.3%p" />
         <Key
             latin:keyStyle="num8KeyStyle" />
         <Key
             latin:keyStyle="num9KeyStyle" />
-        <!-- There is an empty area below the "Enter" key and right of the "9" key.  To ignore
-             the touch event on the area, "9" is intentionally not marked as a right edge key. -->
         </Row>
     <!-- This row is intentionally not marked as a bottom row -->
     <Row>
-        <Spacer
-            latin:horizontalGap="14.5%p" />
-        <!-- There is an empty area below the "More" key and left of the "space" key.  To ignore
-             the touch event on the area, "space" is intentionally not marked as a left edge key. -->
+        <Key
+            latin:keyStyle="tabKeyStyle"
+            latin:keyWidth="10.0%p"
+            latin:keyEdgeFlags="left" />
         <Key
             latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
+            latin:keyXPos="19.0%p"
             latin:keyWidth="18.2%p" />
-        <Spacer
-            latin:horizontalGap="9.1%p" />
         <Key
             latin:keyStyle="numStarKeyStyle"
-            latin:keyWidth="13.7%p" />
+            latin:keyXPos="43.3%p" />
         <Key
-            latin:keyStyle="num0KeyStyle"
-            latin:keyWidth="13.7%p" />>
+            latin:keyStyle="num0KeyStyle" />
         <Key
-            latin:keyStyle="numPoundKeyStyle"
-            latin:keyWidth="13.7%p" />
-        <Spacer
-            latin:horizontalGap="4.3%p" />
-        <include
-            latin:keyboardLayout="@xml/kbd_settings" />
+            latin:keyStyle="numPoundKeyStyle" />
+        <Key
+            latin:keyStyle="micOrSettingsKeyStyle"
+            latin:keyXPos="-10.0%p"
+            latin:keyWidth="0.0%p"
+            latin:keyEdgeFlags="right" />
     </Row>
 </Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_phone_symbols.xml b/java/res/xml-sw600dp/kbd_phone_symbols.xml
index 63ef4128f..895ca63fc 100644
--- a/java/res/xml-sw600dp/kbd_phone_symbols.xml
+++ b/java/res/xml-sw600dp/kbd_phone_symbols.xml
@@ -23,7 +23,7 @@
     latin:keyboardHeight="@dimen/keyboardHeight"
     latin:maxKeyboardHeight="50%p"
     latin:rowHeight="25%p"
-    latin:keyWidth="13.7%p"
+    latin:keyWidth="12.7%p"
     latin:horizontalGap="@dimen/key_horizontal_gap"
     latin:verticalGap="@dimen/key_bottom_gap"
     latin:popupKeyboardTemplate="@xml/kbd_popup_template"
@@ -35,11 +35,10 @@
         latin:keyboardLayout="@xml/kbd_numkey_styles" />
     <!-- This row is intentionally not marked as a top row -->
     <Row>
-        <Spacer
-            latin:horizontalGap="10.0%p" />
         <Key
             latin:code="45"
             latin:keyLabel=" - "
+            latin:keyXPos="14.5%p"
             latin:keyWidth="9.1%p" />
         <Key
             latin:code="43"
@@ -49,27 +48,24 @@
             latin:code="44"
             latin:keyLabel="@string/label_pause_key"
             latin:keyWidth="9.1%p" />
-        <Spacer
-            latin:horizontalGap="4.5%p" />
         <Key
-            latin:keyStyle="num1KeyStyle" />
+            latin:keyStyle="num1KeyStyle"
+            latin:keyXPos="43.3%p" />
         <Key
             latin:keyStyle="num2KeyStyle" />
         <Key
             latin:keyStyle="num3KeyStyle" />
-        <Spacer
-            latin:horizontalGap="8.1%p" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="9.2%p"
+            latin:keyXPos="-10.0%p"
+            latin:keyWidth="0%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row>
-        <Spacer
-            latin:horizontalGap="10.0%p" />
         <Key
             latin:code="44"
             latin:keyLabel=" , "
+            latin:keyXPos="14.5%p"
             latin:keyWidth="9.1%p" />
         <Key
             latin:code="46"
@@ -79,19 +75,17 @@
             latin:code="59"
             latin:keyLabel="@string/label_wait_key"
             latin:keyWidth="9.1%p" />
-        <Spacer
-            latin:horizontalGap="4.5%p" />
         <Key
-            latin:keyStyle="num4KeyStyle" />
+            latin:keyStyle="num4KeyStyle"
+            latin:keyXPos="43.3%p" />
         <Key
             latin:keyStyle="num5KeyStyle" />
         <Key
             latin:keyStyle="num6KeyStyle" />
-        <Spacer
-            latin:horizontalGap="2.6%p" />
         <Key
             latin:keyStyle="returnKeyStyle"
-            latin:keyWidth="14.6%p"
+            latin:keyXPos="-14.6%p"
+            latin:keyWidth="0%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row>
@@ -104,6 +98,7 @@
         <Key
             latin:code="40"
             latin:keyLabel=" ( "
+            latin:keyXPos="14.5%p"
             latin:keyWidth="9.1%p" />
         <Key
             latin:code="41"
@@ -113,37 +108,35 @@
             latin:code="78"
             latin:keyLabel=" N "
             latin:keyWidth="9.1%p" />
-        <Spacer
-            latin:horizontalGap="4.5%p" />
         <Key
-            latin:keyStyle="num7KeyStyle" />
+            latin:keyStyle="num7KeyStyle"
+            latin:keyXPos="43.3%p" />
         <Key
             latin:keyStyle="num8KeyStyle" />
         <Key
             latin:keyStyle="num9KeyStyle" />
-        <!-- There is an empty area below the "Enter" key and right of the "9" key.  To ignore
-             the touch event on the area, "9" is intentionally not marked as a right edge key. -->
     </Row>
     <!-- This row is intentionally not marked as a bottom row -->
     <Row>
-        <Spacer
-            latin:horizontalGap="10.0%p" />
-        <!-- There is an empty area below the "More" key and left of the "space" key.  To ignore
-             the touch event on the area, "space" is intentionally not marked as a left edge key. -->
+        <Key
+            latin:keyStyle="tabKeyStyle"
+            latin:keyWidth="10.0%p"
+            latin:keyEdgeFlags="left" />
         <Key
             latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
+            latin:keyXPos="14.5%p"
             latin:keyWidth="27.2%p" />
-        <Spacer
-            latin:horizontalGap="4.5%p" />
         <Key
-            latin:keyStyle="numStarKeyStyle" />
+            latin:keyStyle="numStarKeyStyle"
+            latin:keyXPos="43.3%p" />
         <Key
             latin:keyStyle="num0KeyStyle" />
         <Key
             latin:keyStyle="numPoundKeyStyle" />
-        <Spacer
-            latin:horizontalGap="4.3%p" />
-        <include
-            latin:keyboardLayout="@xml/kbd_settings" />
+        <Key
+            latin:keyStyle="micOrSettingsKeyStyle"
+            latin:keyXPos="-10.0%p"
+            latin:keyWidth="0.0%p"
+            latin:keyEdgeFlags="right" />
     </Row>
 </Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row1.xml b/java/res/xml-sw600dp/kbd_qwerty_row1.xml
index d3d5b25e6..af1bd5d50 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row1.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row1.xml
@@ -22,7 +22,7 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <Row
-        latin:keyWidth="9.1%p"
+        latin:keyWidth="9.0%p"
         latin:rowEdgeFlags="top"
     >
         <Key
@@ -68,7 +68,8 @@
             latin:popupCharacters="@string/alternates_for_p" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="9.2%p"
+            latin:keyXPos="-10.0%p"
+            latin:keyWidth="-10.0%p"
             latin:keyEdgeFlags="right" />
     </Row>
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row2.xml b/java/res/xml-sw600dp/kbd_qwerty_row2.xml
index aecb4f4a9..1e6011cde 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row2.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row2.xml
@@ -24,11 +24,10 @@
     <Row
         latin:keyWidth="9.0%p"
     >
-        <Spacer
-            latin:horizontalGap="4.5%p" />
         <Key
             latin:keyLabel="a"
             latin:popupCharacters="@string/alternates_for_a"
+            latin:keyXPos="4.5%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="s"
@@ -53,7 +52,8 @@
             latin:popupCharacters="@string/alternates_for_l" />
         <Key
             latin:keyStyle="returnKeyStyle"
-            latin:keyWidth="14.6%p"
+            latin:keyXPos="-14.6%p"
+            latin:keyWidth="-14.6%p"
             latin:keyEdgeFlags="right" />
     </Row>
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row3.xml b/java/res/xml-sw600dp/kbd_qwerty_row3.xml
index e50f9079c..700bcf005 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row3.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row3.xml
@@ -26,7 +26,7 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p"
+            latin:keyWidth="11.1%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="z"
@@ -70,9 +70,7 @@
                     latin:popupCharacters="\?" />
             </default>
         </switch>
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.1%p"
-            latin:keyEdgeFlags="right" />
+        <include
+            latin:keyboardLayout="@xml/kbd_row3_right" />
     </Row>
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row4.xml b/java/res/xml-sw600dp/kbd_qwerty_row4.xml
index 57367462a..648775c97 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row4.xml
@@ -23,129 +23,45 @@
 >
     <!-- This row is intentionally not marked as a bottom row -->
     <Row
-        latin:keyWidth="8.9%p"
+        latin:keyWidth="9.1%p"
     >
         <Key
             latin:keyStyle="toSymbolKeyStyle"
             latin:keyLabelOption="alignLeft"
             latin:keyWidth="13.0%p"
             latin:keyEdgeFlags="left" />
+        <Key
+            latin:keyStyle="tabKeyStyle"
+            latin:keyWidth="8.9%p" />
         <switch>
             <case
-                latin:languageCode="ru"
+                latin:mode="email"
             >
-                <switch>
-                    <!-- TODO: implement logical OR for <case> attribute -->
-                    <case
-                        latin:mode="email"
-                    >
-                        <Key
-                            latin:keyStyle="comKeyStyle" />
-                    </case>
-                    <case
-                        latin:mode="url"
-                    >
-                        <Key
-                            latin:keyStyle="comKeyStyle" />
-                    </case>
-                    <case
-                        latin:imeAction="actionSearch"
-                    >
-                        <Key
-                            latin:keyLabel=":"
-                            latin:manualTemporaryUpperCaseCode="43"
-                            latin:keyHintIcon="@drawable/key_hint_plus_holo"
-                            latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_plus_large_holo"
-                            latin:popupCharacters="+" />
-                    </case>
-                    <default>
-                        <Key
-                            latin:keyStyle="smileyKeyStyle" />
-                    </default>
-                </switch>
-                <switch>
-                    <case
-                        latin:mode="email"
-                    >
-                        <Key
-                            latin:keyLabel="\@" />
-                    </case>
-                    <case
-                        latin:mode="url"
-                    >
-                        <Key
-                            latin:keyLabel="-"
-                            latin:manualTemporaryUpperCaseCode="95"
-                            latin:keyHintIcon="@drawable/key_hint_underline_holo"
-                            latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo"
-                            latin:popupCharacters="_" />
-                    </case>
-                    <default>
-                        <Key
-                            latin:keyLabel="/"
-                            latin:manualTemporaryUpperCaseCode="64"
-                            latin:keyHintIcon="@drawable/key_hint_at_holo"
-                            latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_at_large_holo"
-                            latin:popupCharacters="\@" />
-                    </default>
-                </switch>
+                <Key
+                    latin:keyStyle="comKeyStyle"
+                    latin:keyWidth="8.9%p" />
+            </case>
+            <case
+                latin:mode="url"
+            >
+                <Key
+                    latin:keyStyle="comKeyStyle"
+                    latin:keyWidth="8.9%p" />
             </case>
-            <!-- not languageCode="ru" -->
             <default>
-                <switch>
-                    <case
-                        latin:mode="url"
-                    >
-                        <Key
-                            latin:keyStyle="comKeyStyle"
-                            latin:keyWidth="17.8%p" />
-                    </case>
-                    <default>
-                        <switch>
-                            <case
-                                latin:mode="email"
-                            >
-                                <Key
-                                    latin:keyStyle="comKeyStyle" />
-                            </case>
-                            <case
-                                latin:imeAction="actionSearch"
-                            >
-                                <Key
-                                    latin:keyLabel=":"
-                                    latin:manualTemporaryUpperCaseCode="43"
-                                    latin:keyHintIcon="@drawable/key_hint_plus_holo"
-                                    latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_plus_large_holo"
-                                    latin:popupCharacters="+" />
-                            </case>
-                            <default>
-                                <Key
-                                    latin:keyStyle="smileyKeyStyle" />
-                            </default>
-                        </switch>
-                        <switch>
-                            <case
-                                latin:mode="email"
-                            >
-                                <Key
-                                    latin:keyLabel="\@" />
-                            </case>
-                            <default>
-                                <Key
-                                    latin:keyLabel="/"
-                                    latin:manualTemporaryUpperCaseCode="64"
-                                    latin:keyHintIcon="@drawable/key_hint_at_holo"
-                                    latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_at_large_holo"
-                                    latin:popupCharacters="\@" />
-                            </default>
-                        </switch>
-                    </default>
-                </switch>
+                <Key
+                    latin:keyLabel="/"
+                    latin:manualTemporaryUpperCaseCode="64"
+                    latin:keyHintIcon="@drawable/key_hint_at_holo"
+                    latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_at_large_holo"
+                    latin:popupCharacters="\@"
+                    latin:keyWidth="8.9%p" />
             </default>
         </switch>
         <Key
             latin:keyStyle="spaceKeyStyle"
-            latin:keyWidth="38.5%p" />
+            latin:keyXPos="30.8%p"
+            latin:keyWidth="41.0%p" />
         <switch>
             <case
                 latin:languageCode="ru"
@@ -239,7 +155,10 @@
                 </switch>
             </default>
         </switch>
-        <include
-            latin:keyboardLayout="@xml/kbd_settings" />
+        <Key
+            latin:keyStyle="micOrSettingsKeyStyle"
+            latin:keyXPos="-10.0%p"
+            latin:keyWidth="-10.0%p"
+            latin:keyEdgeFlags="right" />
     </Row>
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_rows_scandinavia.xml b/java/res/xml-sw600dp/kbd_qwerty_rows_scandinavia.xml
index 7e4635b8c..0974a9d7c 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_rows_scandinavia.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_rows_scandinavia.xml
@@ -24,14 +24,14 @@
     <include
         latin:keyboardLayout="@xml/kbd_key_styles" />
     <Row
-        latin:keyWidth="9.09%p"
+        latin:keyWidth="8.0%p"
         latin:rowEdgeFlags="top"
     >
         <Key
             latin:keyLabel="q"
             latin:keyHintIcon="@drawable/key_hint_num1_holo"
             latin:popupCharacters="@string/alternates_for_q"
-            latin:keyWidth="8.75%p"
+            latin:keyXPos="2.15%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="w"
@@ -70,17 +70,19 @@
             latin:keyHintIcon="@drawable/key_hint_num0_holo"
             latin:popupCharacters="@string/alternates_for_p" />
         <Key
-            latin:keyLabel="å"
-            latin:keyWidth="8.75%p"
+            latin:keyLabel="å" />
+        <Key
+            latin:keyStyle="deleteKeyStyle"
+            latin:keyXPos="-10.0%p"
+            latin:keyWidth="-10.0%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row
-        latin:keyWidth="9.09%p"
+        latin:keyWidth="8.0%p"
     >
         <Key
             latin:keyLabel="a"
             latin:popupCharacters="@string/alternates_for_a"
-            latin:keyWidth="8.75%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="s"
@@ -108,8 +110,11 @@
             latin:popupCharacters="@string/alternates_for_scandinavia_row2_10" />
         <Key
             latin:keyLabel="@string/keylabel_for_scandinavia_row2_11"
-            latin:popupCharacters="@string/alternates_for_scandinavia_row2_11"
-            latin:keyWidth="8.75%p"
+            latin:popupCharacters="@string/alternates_for_scandinavia_row2_11" />
+        <Key
+            latin:keyStyle="returnKeyStyle"
+            latin:keyXPos="-14.6%p"
+            latin:keyWidth="-14.6%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <include
diff --git a/java/res/xml-sw600dp/kbd_qwertz_rows.xml b/java/res/xml-sw600dp/kbd_qwertz_rows.xml
index 534276ccb..3490cc7fd 100644
--- a/java/res/xml-sw600dp/kbd_qwertz_rows.xml
+++ b/java/res/xml-sw600dp/kbd_qwertz_rows.xml
@@ -24,7 +24,7 @@
     <include
         latin:keyboardLayout="@xml/kbd_key_styles" />
     <Row
-        latin:keyWidth="10%p"
+        latin:keyWidth="9.0%p"
         latin:rowEdgeFlags="top"
     >
         <Key
@@ -67,17 +67,21 @@
         <Key
             latin:keyLabel="p"
             latin:keyHintIcon="@drawable/key_hint_num0_holo"
-            latin:popupCharacters="@string/alternates_for_p"
+            latin:popupCharacters="@string/alternates_for_p" />
+        <Key
+            latin:keyStyle="deleteKeyStyle"
+            latin:keyXPos="-10.0%p"
+            latin:keyWidth="-10.0%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <include
         latin:keyboardLayout="@xml/kbd_qwerty_row2" />
     <Row
-        latin:keyWidth="10%p"
+        latin:keyWidth="8.9%p"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
+            latin:keyWidth="11.1%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="y"
@@ -97,11 +101,33 @@
             latin:popupCharacters="@string/alternates_for_n" />
         <Key
             latin:keyLabel="m" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="15%p"
-            latin:keyEdgeFlags="right" />
+        <switch>
+            <case
+                latin:mode="email"
+            >
+                <Key
+                    latin:keyLabel="," />
+                <Key
+                    latin:keyLabel="." />
+            </case>
+            <default>
+                <Key
+                    latin:keyLabel=","
+                    latin:manualTemporaryUpperCaseCode="33"
+                    latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
+                    latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo"
+                    latin:popupCharacters="!" />
+                <Key
+                    latin:keyLabel="."
+                    latin:manualTemporaryUpperCaseCode="63"
+                    latin:keyHintIcon="@drawable/key_hint_question_holo"
+                    latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo"
+                    latin:popupCharacters="\?" />
+            </default>
+        </switch>
+        <include
+            latin:keyboardLayout="@xml/kbd_row3_right" />
     </Row>
-   <include
+    <include
         latin:keyboardLayout="@xml/kbd_qwerty_row4" />
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_row3_right.xml b/java/res/xml-sw600dp/kbd_row3_right.xml
new file mode 100644
index 000000000..7867e175a
--- /dev/null
+++ b/java/res/xml-sw600dp/kbd_row3_right.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, 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"
+>
+    <switch>
+        <case
+            latin:mode="email"
+        >
+            <Key
+                latin:keyLabel="\@"
+                latin:keyXPos="-8.9%p"
+                latin:keyWidth="-8.9%p"
+                latin:keyEdgeFlags="right" />
+        </case>
+        <case
+            latin:mode="url"
+        >
+            <Key
+                latin:keyLabel="-"
+                latin:manualTemporaryUpperCaseCode="95"
+                latin:keyHintIcon="@drawable/key_hint_underline_holo"
+                latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo"
+                latin:popupCharacters="_"
+                latin:keyXPos="-8.9%p"
+                latin:keyWidth="-8.9%p"
+                latin:keyEdgeFlags="right" />
+        </case>
+        <case
+            latin:imeAction="actionSearch"
+        >
+            <Key
+                latin:keyLabel=":"
+                latin:manualTemporaryUpperCaseCode="43"
+                latin:keyHintIcon="@drawable/key_hint_plus_holo"
+                latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_plus_large_holo"
+                latin:popupCharacters="+"
+                latin:keyXPos="-8.9%p"
+                latin:keyWidth="-8.9%p"
+                latin:keyEdgeFlags="right" />
+        </case>
+        <default>
+            <Key
+                latin:keyStyle="smileyKeyStyle"
+                latin:keyXPos="-8.9%p"
+                latin:keyWidth="-8.9%p"
+                latin:keyEdgeFlags="right" />
+        </default>
+    </switch>
+</merge>
diff --git a/java/res/xml-sw600dp/kbd_ru_rows.xml b/java/res/xml-sw600dp/kbd_ru_rows.xml
index 0c7a997a6..95f297dd1 100644
--- a/java/res/xml-sw600dp/kbd_ru_rows.xml
+++ b/java/res/xml-sw600dp/kbd_ru_rows.xml
@@ -24,14 +24,14 @@
     <include
         latin:keyboardLayout="@xml/kbd_key_styles" />
     <Row
-        latin:keyWidth="9.091%p"
+        latin:keyWidth="8.0%p"
         latin:rowEdgeFlags="top"
     >
         <Key
             latin:keyLabel="й"
             latin:keyHintIcon="@drawable/key_hint_num1_holo"
             latin:popupCharacters="1"
-            latin:keyWidth="8.75%p"
+            latin:keyXPos="2.15%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="ц"
@@ -70,16 +70,18 @@
             latin:keyHintIcon="@drawable/key_hint_num0_holo"
             latin:popupCharacters="0" />
         <Key
-            latin:keyLabel="х"
-            latin:keyWidth="8.75%p"
+            latin:keyLabel="х" />
+        <Key
+            latin:keyStyle="deleteKeyStyle"
+            latin:keyXPos="-10.0%p"
+            latin:keyWidth="-10.0%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row
-            latin:keyWidth="9.091%p"
+            latin:keyWidth="8.0%p"
     >
         <Key
             latin:keyLabel="ф"
-            latin:keyWidth="8.75%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="ы" />
@@ -100,16 +102,19 @@
         <Key
             latin:keyLabel="ж" />
         <Key
-            latin:keyLabel="э"
-            latin:keyWidth="8.75%p"
+            latin:keyLabel="э" />
+        <Key
+            latin:keyStyle="returnKeyStyle"
+            latin:keyXPos="-14.6%p"
+            latin:keyWidth="-14.6%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row
-        latin:keyWidth="8.5%p"
+        latin:keyWidth="8.0%p"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="11.75%p"
+            latin:keyWidth="11.1%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="я" />
@@ -131,9 +136,13 @@
         <Key
             latin:keyLabel="ю" />
         <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="11.75%p"
-            latin:keyEdgeFlags="right" />
+            latin:keyLabel="."
+            latin:manualTemporaryUpperCaseCode="44"
+            latin:keyHintIcon="@drawable/key_hint_comma_holo"
+            latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_comma_large_holo"
+            latin:popupCharacters="," />
+        <include
+            latin:keyboardLayout="@xml/kbd_row3_right" />
     </Row>
     <include
         latin:keyboardLayout="@xml/kbd_qwerty_row4" />
diff --git a/java/res/xml-sw600dp/kbd_settings.xml b/java/res/xml-sw600dp/kbd_settings.xml
deleted file mode 100644
index 4f679ca93..000000000
--- a/java/res/xml-sw600dp/kbd_settings.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, 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"
->
-    <switch>
-        <case
-            latin:webInput="true"
-        >
-            <switch>
-                <case
-                    latin:voiceKeyEnabled="true"
-                    latin:passwordInput="false"
-                >
-                    <Key
-                        latin:keyStyle="webTabKeyStyle"
-                        latin:keyWidth="6.4%p" />
-                    <Key
-                        latin:keyStyle="micKeyStyle"
-                        latin:keyWidth="6.5%p" />
-                </case>
-                <default>
-                    <Spacer
-                        latin:horizontalGap="4.15%p" />
-                    <Key
-                        latin:keyStyle="webTabKeyStyle"
-                        latin:keyWidth="8.9%p" />
-                </default>
-            </switch>
-        </case>
-        <default>
-            <switch>
-                <case
-                    latin:hasSettingsKey="true"
-                    latin:voiceKeyEnabled="true"
-                >
-                    <Key
-                        latin:keyStyle="settingsKeyStyle"
-                        latin:keyWidth="6.4%p" />
-                    <Key
-                        latin:keyStyle="micKeyStyle"
-                        latin:keyWidth="6.5%p" />
-                </case>
-                <case
-                    latin:hasSettingsKey="true"
-                    latin:voiceKeyEnabled="false"
-                >
-                    <Spacer
-                        latin:horizontalGap="4.15%p" />
-                    <Key
-                        latin:keyStyle="settingsKeyStyle"
-                        latin:keyWidth="8.9%p" />
-                </case>
-                <case
-                    latin:hasSettingsKey="false"
-                    latin:voiceKeyEnabled="true"
-                >
-                    <Spacer
-                        latin:horizontalGap="4.15%p" />
-                    <Key
-                        latin:keyStyle="micKeyStyle"
-                        latin:keyWidth="8.9%p" />
-                </case>
-                <default>
-                    <Spacer
-                        latin:horizontalGap="13.0%p" />
-                </default>
-            </switch>
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml-sw600dp/kbd_sr_rows.xml b/java/res/xml-sw600dp/kbd_sr_rows.xml
index 71d0e60f1..8c8539ec2 100644
--- a/java/res/xml-sw600dp/kbd_sr_rows.xml
+++ b/java/res/xml-sw600dp/kbd_sr_rows.xml
@@ -24,13 +24,14 @@
     <include
         latin:keyboardLayout="@xml/kbd_key_styles" />
     <Row
-        latin:keyWidth="9.09%p"
+        latin:keyWidth="8.0%p"
         latin:rowEdgeFlags="top"
     >
         <Key
             latin:keyLabel="љ"
             latin:keyHintIcon="@drawable/key_hint_num1_holo"
             latin:popupCharacters="1"
+            latin:keyXPos="2.15%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="њ"
@@ -69,11 +70,15 @@
             latin:keyHintIcon="@drawable/key_hint_num0_holo"
             latin:popupCharacters="0" />
         <Key
-            latin:keyLabel="ш"
+            latin:keyLabel="ш" />
+        <Key
+            latin:keyStyle="deleteKeyStyle"
+            latin:keyXPos="-10.0%p"
+            latin:keyWidth="-10.0%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row
-        latin:keyWidth="9.09%p"
+        latin:keyWidth="7.9%p"
     >
         <Key
             latin:keyLabel="а"
@@ -97,14 +102,19 @@
         <Key
             latin:keyLabel="ч" />
         <Key
-            latin:keyLabel="ћ"
+            latin:keyLabel="ћ" />
+        <Key
+            latin:keyStyle="returnKeyStyle"
+            latin:keyXPos="-14.6%p"
+            latin:keyWidth="-14.6%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row
-        latin:keyWidth="8.90%p"
+        latin:keyWidth="7.5%p"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
+            latin:keyWidth="8.8%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="ѕ" />
@@ -124,10 +134,32 @@
             latin:keyLabel="ђ" />
         <Key
             latin:keyLabel="ж" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="11.00%p"
-            latin:keyEdgeFlags="right" />
+        <switch>
+            <case
+                latin:mode="email"
+            >
+                <Key
+                    latin:keyLabel="," />
+                <Key
+                    latin:keyLabel="." />
+            </case>
+            <default>
+                <Key
+                    latin:keyLabel=","
+                    latin:manualTemporaryUpperCaseCode="33"
+                    latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
+                    latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo"
+                    latin:popupCharacters="!" />
+                <Key
+                    latin:keyLabel="."
+                    latin:manualTemporaryUpperCaseCode="63"
+                    latin:keyHintIcon="@drawable/key_hint_question_holo"
+                    latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo"
+                    latin:popupCharacters="\?" />
+            </default>
+        </switch>
+        <include
+            latin:keyboardLayout="@xml/kbd_row3_right" />
     </Row>
     <include
         latin:keyboardLayout="@xml/kbd_qwerty_row4" />
diff --git a/java/res/xml-sw600dp/kbd_symbols.xml b/java/res/xml-sw600dp/kbd_symbols.xml
index c89cd2fba..2daaadd02 100644
--- a/java/res/xml-sw600dp/kbd_symbols.xml
+++ b/java/res/xml-sw600dp/kbd_symbols.xml
@@ -34,7 +34,7 @@
         latin:keyboardLayout="@xml/kbd_currency_key_styles" />
     <!-- This row is intentionally not marked as a top row -->
     <Row
-        latin:keyWidth="9.1%p"
+        latin:keyWidth="9.0%p"
     >
         <Key
             latin:keyLabel="1"
@@ -65,16 +65,16 @@
             latin:popupCharacters="ⁿ,∅" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="9.2%p"
+            latin:keyXPos="-10.0%p"
+            latin:keyWidth="-10.0%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row
         latin:keyWidth="9.0%p"
     >
-        <Spacer
-            latin:horizontalGap="4.5%p" />
         <Key
-            latin:keyLabel="#" />
+            latin:keyLabel="#"
+            latin:keyXPos="4.5%p" />
         <Key
             latin:keyStyle="currencyKeyStyle" />
         <Key
@@ -99,7 +99,8 @@
             latin:popupCharacters="],},&gt;" />
         <Key
             latin:keyStyle="returnKeyStyle"
-            latin:keyWidth="14.6%p"
+            latin:keyXPos="-14.6%p"
+            latin:keyWidth="-14.6%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row
@@ -107,7 +108,7 @@
     >
         <Key
             latin:keyStyle="moreKeyStyle"
-            latin:keyWidth="10.0%p"
+            latin:keyWidth="11.1%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="&lt;"
@@ -171,9 +172,8 @@
             </default>
         </switch>
         <Key
-            latin:keyStyle="moreKeyStyle"
-            latin:keyWidth="10.1%p"
-            latin:keyEdgeFlags="right" />
+            latin:keyLabel="/"
+            latin:keyWidth="0%p" />
     </Row>
     <!-- This row is intentionally not marked as a bottom row -->
     <Row
@@ -185,20 +185,23 @@
             latin:keyWidth="13.0%p"
             latin:keyEdgeFlags="left" />
         <Key
-            latin:keyLabel="/" />
+            latin:keyStyle="tabKeyStyle" />
         <Key
             latin:keyLabel="\@" />
         <Key
             latin:keyStyle="spaceKeyStyle"
-            latin:keyWidth="38.5%p" />
+            latin:keyXPos="30.8%p"
+            latin:keyWidth="41.0%p" />
         <switch>
             <case
                 latin:languageCode="ru"
             >
                 <Key
-                    latin:keyLabel="_" />
+                    latin:keyLabel="_"
+                    latin:keyWidth="9.1%p" />
                 <Key
-                    latin:keyLabel="-" />
+                    latin:keyLabel="-"
+                    latin:keyWidth="9.1%p" />
             </case>
             <default>
                 <!-- Note: DroidSans doesn't have double-high-reversed-quotation
@@ -206,12 +209,17 @@
                 <!-- latin:popupCharacters="“,”,„,‟,«,»,‘,’,‚,‛" -->
                 <Key
                     latin:keyLabel="&quot;"
-                    latin:popupCharacters="“,”,«,»,‘,’,‚,‛" />
+                    latin:popupCharacters="“,”,«,»,‘,’,‚,‛"
+                    latin:keyWidth="9.1%p" />
                 <Key
-                    latin:keyLabel="_" />
+                    latin:keyLabel="_"
+                    latin:keyWidth="9.1%p" />
             </default>
         </switch>
-        <include
-            latin:keyboardLayout="@xml/kbd_settings" />
+        <Key
+            latin:keyStyle="micOrSettingsKeyStyle"
+            latin:keyXPos="-10.0%p"
+            latin:keyWidth="-10.0%p"
+            latin:keyEdgeFlags="right" />
     </Row>
 </Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_symbols_shift.xml b/java/res/xml-sw600dp/kbd_symbols_shift.xml
index 7195f6a7e..111718a4d 100644
--- a/java/res/xml-sw600dp/kbd_symbols_shift.xml
+++ b/java/res/xml-sw600dp/kbd_symbols_shift.xml
@@ -32,7 +32,7 @@
         latin:keyboardLayout="@xml/kbd_key_styles" />
     <!-- This row is intentionally not marked as a top row -->
     <Row
-        latin:keyWidth="9.1%p"
+        latin:keyWidth="9.0%p"
     >
         <Key
             latin:keyLabel="~" />
@@ -66,17 +66,17 @@
             latin:keyLabel="Δ" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="9.2%p"
+            latin:keyXPos="-10.0%p"
+            latin:keyWidth="-10.0%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row
         latin:keyWidth="9.0%p"
     >
-        <Spacer
-            latin:horizontalGap="4.5%p" />
         <Key
             latin:keyStyle="nonPasswordSymbolKeyStyle"
-            latin:keyLabel="£" />
+            latin:keyLabel="£"
+            latin:keyXPos="4.5%p" />
         <Key
             latin:keyStyle="nonPasswordSymbolKeyStyle"
             latin:keyLabel="¢" />
@@ -103,7 +103,8 @@
             latin:keyLabel="}" />
         <Key
             latin:keyStyle="returnKeyStyle"
-            latin:keyWidth="14.6%p"
+            latin:keyXPos="-14.6%p"
+            latin:keyWidth="-14.6%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row
@@ -111,7 +112,7 @@
     >
         <Key
             latin:keyStyle="moreKeyStyle"
-            latin:keyWidth="10.0%p"
+            latin:keyWidth="11.1%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="\\" />
@@ -137,10 +138,6 @@
         <Key
             latin:keyStyle="nonPasswordSymbolKeyStyle"
             latin:keyLabel="¿" />
-        <Key
-            latin:keyStyle="moreKeyStyle"
-            latin:keyWidth="10.1%p"
-            latin:keyEdgeFlags="right" />
     </Row>
     <!-- This row is intentionally not marked as a bottom row -->
     <Row
@@ -151,14 +148,16 @@
             latin:keyLabelOption="alignLeft"
             latin:keyWidth="13.0%p"
             latin:keyEdgeFlags="left" />
-        <Spacer
-            latin:horizontalGap="17.8%p" />
+        <Key
+            latin:keyStyle="tabKeyStyle" />
         <Key
             latin:keyStyle="spaceKeyStyle"
-            latin:keyWidth="38.5%p" />
-        <Spacer
-            latin:horizontalGap="17.8%p" />
-        <include
-            latin:keyboardLayout="@xml/kbd_settings" />
+            latin:keyXPos="30.8%p"
+            latin:keyWidth="41.0%p" />
+        <Key
+            latin:keyStyle="micOrSettingsKeyStyle"
+            latin:keyXPos="-10.0%p"
+            latin:keyWidth="0.0%p"
+            latin:keyEdgeFlags="right" />
     </Row>
 </Keyboard>