New xlarge keyboard layout (v2)

Bug: 3109804
Change-Id: I1afd022d553785acd50b3104374bbec291206c1e
diff --git a/java/res/xml-xlarge/kbd_symbols.xml b/java/res/xml-xlarge/kbd_symbols.xml
index 34fc114..5398151 100644
--- a/java/res/xml-xlarge/kbd_symbols.xml
+++ b/java/res/xml-xlarge/kbd_symbols.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"
@@ -54,12 +54,10 @@
         <Key
             latin:keyLabel="0" />
         <Key
-            latin:keyLabel="~" />
-        <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:keyWidth="11.0%p"
             latin:isModifier="true"
             latin:isRepeatable="true"
             latin:keyEdgeFlags="right" />
@@ -68,7 +66,7 @@
         <Key
             latin:codes="@integer/key_symbol"
             latin:keyLabel="@string/label_alpha_key"
-            latin:keyWidth="8.75%p"
+            latin:keyWidth="9.7%p"
             latin:isModifier="true"
             latin:keyEdgeFlags="left" />
         <Key
@@ -80,8 +78,6 @@
         <Key
             latin:keyLabel="%" />
         <Key
-            latin:keyLabel="^" />
-        <Key
             latin:keyLabel="&amp;" />
         <Key
             latin:keyLabel="*" />
@@ -97,7 +93,7 @@
             latin:codes="@integer/key_return"
             latin:keyIcon="@drawable/sym_keyboard_return"
             latin:iconPreview="@drawable/sym_keyboard_feedback_return"
-            latin:keyWidth="8.75%p"
+            latin:keyWidth="8.3%p"
             latin:isModifier="true"
             latin:keyEdgeFlags="right" />
     </Row>
@@ -106,13 +102,11 @@
             latin:codes="@integer/key_shift"
             latin:keyLabel="@string/label_more_key"
             latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
-            latin:keyWidth="12.5%p"
+            latin:keyWidth="13.1%p"
             latin:isModifier="true"
             latin:isSticky="true"
             latin:keyEdgeFlags="left" />
         <Key
-            latin:keyLabel="!" />
-        <Key
             latin:keyLabel="&quot;" />
         <Key
             latin:keyLabel="\'" />
@@ -123,18 +117,18 @@
         <Key
             latin:keyLabel="/" />
         <Key
-            latin:keyLabel="\\" />
-        <Key
             latin:keyLabel="," />
         <Key
             latin:keyLabel="." />
         <Key
+            latin:keyLabel="!" />
+        <Key
             latin:keyLabel="\?" />
         <Key
             latin:codes="@integer/key_shift"
             latin:keyLabel="@string/label_more_key"
             latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
-            latin:keyWidth="12.5%p"
+            latin:keyWidth="13.1%p"
             latin:isModifier="true"
             latin:isSticky="true"
             latin:keyEdgeFlags="right" />
@@ -142,20 +136,12 @@
     <!-- This row is intentionally not marked as a bottom row -->
     <Row>
         <Spacer
-            latin:horizontalGap="16.25%p" />
-        <Key
-            latin:keyLabel="&lt;" />
-        <Key
-            latin:keyLabel="&gt;" />
+            latin:horizontalGap="31.5%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:keyWidth="37.0%p"
             latin:isModifier="true" />
-        <Key
-            latin:keyLabel="[" />
-        <Key
-            latin:keyLabel="]" />
     </Row>
 </Keyboard>