New xlarge keyboard layout (v2)

Bug: 3109804
Change-Id: I1afd022d553785acd50b3104374bbec291206c1e
diff --git a/java/res/xml-xlarge/kbd_qwerty.xml b/java/res/xml-xlarge/kbd_qwerty.xml
index 6836c2d..b4b880e 100644
--- a/java/res/xml-xlarge/kbd_qwerty.xml
+++ b/java/res/xml-xlarge/kbd_qwerty.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"
@@ -99,7 +99,7 @@
     <Row
         latin:keyboardMode="@+id/mode_im"
     >
-        <include latin:keyboardLayout="@xml/kbd_qwerty_row4_im" />
+        <include latin:keyboardLayout="@xml/kbd_qwerty_row4_common" />
     </Row>
     <Row
         latin:keyboardMode="@+id/mode_webentry"