New xlarge keyboard layout (v2)

Bug: 3109804
Change-Id: I1afd022d553785acd50b3104374bbec291206c1e
diff --git a/java/res/xml-xlarge/kbd_phone.xml b/java/res/xml-xlarge/kbd_phone.xml
index 107731f..8199b01 100644
--- a/java/res/xml-xlarge/kbd_phone.xml
+++ b/java/res/xml-xlarge/kbd_phone.xml
@@ -20,7 +20,7 @@
 
 <Keyboard
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
-    latin:keyWidth="7.5%p"
+    latin:keyWidth="8.2%p"
     latin:horizontalGap="@dimen/key_horizontal_gap"
     latin:verticalGap="@dimen/key_bottom_gap"
     latin:keyHeight="@dimen/key_height"
@@ -30,13 +30,13 @@
         <Key
             latin:codes="@integer/key_tab"
             latin:keyLabel="@string/label_tab_key"
-            latin:keyWidth="15.0%p"
+            latin:keyWidth="12.1%p"
             latin:isModifier="true"
             latin:keyEdgeFlags="left" />
         <!-- To match one character label size with "Tab", I placed spaces around the char '-'
              and '+'. -->
         <Spacer
-            latin:horizontalGap="6.0%p" />
+            latin:horizontalGap="8.1%p" />
         <Key
             latin:codes="45"
             latin:keyLabel=" - " />
@@ -44,21 +44,21 @@
             latin:codes="43"
             latin:keyLabel=" + " />
         <Spacer
-            latin:horizontalGap="11.5%p" />
+            latin:horizontalGap="8.1%p" />
         <Key
             latin:codes="49"
             latin:keyIcon="@drawable/sym_keyboard_num1"
-            latin:keyWidth="10.5%p " />
+            latin:keyWidth="12.1%p " />
         <Key
             latin:codes="50"
             latin:keyIcon="@drawable/sym_keyboard_num2"
-            latin:keyWidth="10.5%p " />
+            latin:keyWidth="12.1%p " />
         <Key
             latin:codes="51"
             latin:keyIcon="@drawable/sym_keyboard_num3"
-            latin:keyWidth="10.5%p " />
+            latin:keyWidth="12.1%p " />
         <Spacer
-            latin:horizontalGap="6.0%p" />
+            latin:horizontalGap="4.0%p" />
         <Key
             latin:codes="@integer/key_delete"
             latin:keyIcon="@drawable/sym_keyboard_delete"
@@ -72,14 +72,14 @@
         <Key
             latin:codes="@integer/key_symbol"
             latin:keyLabel="@string/label_more_key"
-            latin:keyWidth="15.0%p"
+            latin:keyWidth="12.1%p"
             latin:isModifier="true"
             latin:isSticky="true"
             latin:keyEdgeFlags="left" />
         <!-- To match one character label size with "More", I placed spaces around the char ','
              and '.'. -->
         <Spacer
-            latin:horizontalGap="6.0%p" />
+            latin:horizontalGap="8.1%p" />
         <Key
             latin:codes="44"
             latin:keyLabel=" , " />
@@ -87,21 +87,21 @@
             latin:codes="46"
             latin:keyLabel=" . " />
         <Spacer
-            latin:horizontalGap="11.5%p" />
+            latin:horizontalGap="8.1%p" />
         <Key
             latin:codes="52"
             latin:keyIcon="@drawable/sym_keyboard_num4"
-            latin:keyWidth="10.5%p " />
+            latin:keyWidth="12.1%p " />
         <Key
             latin:codes="53"
             latin:keyIcon="@drawable/sym_keyboard_num5"
-            latin:keyWidth="10.5%p " />
+            latin:keyWidth="12.1%p " />
         <Key
             latin:codes="54"
             latin:keyIcon="@drawable/sym_keyboard_num6"
-            latin:keyWidth="10.5%p " />
+            latin:keyWidth="12.1%p " />
         <Spacer
-            latin:horizontalGap="6.0%p" />
+            latin:horizontalGap="4.0%p" />
         <Key
             latin:codes="@integer/key_return"
             latin:keyIcon="@drawable/sym_keyboard_return"
@@ -116,7 +116,7 @@
         <!-- There is an empty area bellow 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. -->
         <Spacer
-            latin:horizontalGap="21.0%p" />
+            latin:horizontalGap="20.2%p" />
         <Key
             latin:codes="40"
             latin:keyLabel=" ( " />
@@ -124,19 +124,19 @@
             latin:codes="41"
             latin:keyLabel=" ) " />
         <Spacer
-            latin:horizontalGap="11.5%p" />
+            latin:horizontalGap="8.1%p" />
         <Key
             latin:codes="55"
             latin:keyIcon="@drawable/sym_keyboard_num7"
-            latin:keyWidth="10.5%p " />
+            latin:keyWidth="12.1%p " />
         <Key
             latin:codes="56"
             latin:keyIcon="@drawable/sym_keyboard_num8"
-            latin:keyWidth="10.5%p " />
+            latin:keyWidth="12.1%p " />
         <Key
             latin:codes="57"
             latin:keyIcon="@drawable/sym_keyboard_num9"
-            latin:keyWidth="10.5%p " />
+            latin:keyWidth="12.1%p " />
         <!-- There is an empty area bellow 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>
@@ -145,26 +145,26 @@
         <!-- There is an empty area bellow 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. -->
         <Spacer
-            latin:horizontalGap="21.0%p" />
+            latin:horizontalGap="20.2%p" />
         <Key
             latin:codes="@integer/key_space"
             latin:keyIcon="@drawable/sym_keyboard_space"
             latin:iconPreview="@drawable/sym_keyboard_feedback_space"
-            latin:keyWidth="15.0%p" />
+            latin:keyWidth="16.4%p" />
         <Spacer
-            latin:horizontalGap="11.5%p" />
+            latin:horizontalGap="8.1%p" />
         <Key
             latin:codes="42"
             latin:keyIcon="@drawable/sym_keyboard_numstar"
-            latin:keyWidth="10.5%p " />
+            latin:keyWidth="12.1%p " />
         <Key
             latin:codes="48"
             latin:keyIcon="@drawable/sym_keyboard_num0"
-            latin:keyWidth="10.5%p " />
+            latin:keyWidth="12.1%p " />
         <Key
             latin:codes="35"
             latin:keyIcon="@drawable/sym_keyboard_numpound"
-            latin:keyWidth="10.5%p " />
+            latin:keyWidth="12.1%p " />
         <!-- There is an empty area bellow the "Enter" key and right of the "#" key.  To ignore
              the touch event on the area, "#" is intentionally not marked as a right edge key. -->
     </Row>