Tidy up 10-9-7 7-inch tablet layouts
* Slightly smaller key width and larger shift key and space key.
* Both left and right shift key has the same width.
* Move the 2nd-row slight right.
Bug: 6422448
Change-Id: If27028eaac20c503c352ba35dd156befc53918c7
diff --git a/java/res/xml-sw600dp/key_space.xml b/java/res/xml-sw600dp/key_space.xml
index 4e1e15b..234c803 100644
--- a/java/res/xml-sw600dp/key_space.xml
+++ b/java/res/xml-sw600dp/key_space.xml
@@ -30,7 +30,7 @@
latin:keyStyle="languageSwitchKeyStyle" />
<Key
latin:keyStyle="spaceKeyStyle"
- latin:keyWidth="21.950%p" />
+ latin:keyWidth="25.50%p" />
<Key
latin:keyStyle="zwnjKeyStyle" />
</case>
@@ -40,7 +40,7 @@
>
<Key
latin:keyStyle="spaceKeyStyle"
- latin:keyWidth="30.850%p" />
+ latin:keyWidth="34.00%p" />
<Key
latin:keyStyle="zwnjKeyStyle" />
</case>
@@ -51,13 +51,13 @@
latin:keyStyle="languageSwitchKeyStyle" />
<Key
latin:keyStyle="spaceKeyStyle"
- latin:keyWidth="30.850%p" />
+ latin:keyWidth="34.00%p" />
</case>
<!-- languageSwitchKeyEnabled="false" -->
<default>
<Key
latin:keyStyle="spaceKeyStyle"
- latin:keyWidth="39.750%p" />
+ latin:keyWidth="42.50%p" />
</default>
</switch>
</merge>
diff --git a/java/res/xml-sw600dp/row_qwerty4.xml b/java/res/xml-sw600dp/row_qwerty4.xml
index a41dc64..5008696 100644
--- a/java/res/xml-sw600dp/row_qwerty4.xml
+++ b/java/res/xml-sw600dp/row_qwerty4.xml
@@ -22,22 +22,22 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Row
- latin:keyWidth="8.9%p"
+ latin:keyWidth="8.5%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
- latin:keyWidth="13.0%p" />
+ latin:keyWidth="11.75%p" />
<include
latin:keyboardLayout="@xml/keys_f1f2" />
<include
- latin:keyXPos="30.750%p"
+ latin:keyXPos="28.75%p"
latin:keyboardLayout="@xml/key_space" />
<include
latin:keyboardLayout="@xml/key_apostrophe" />
<include
latin:keyboardLayout="@xml/key_dash" />
<include
- latin:keyXPos="-10.00%p"
+ latin:keyXPos="-8.5%p"
latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
diff --git a/java/res/xml-sw600dp/row_symbols4.xml b/java/res/xml-sw600dp/row_symbols4.xml
index 4c0ad23..a4fe5fa 100644
--- a/java/res/xml-sw600dp/row_symbols4.xml
+++ b/java/res/xml-sw600dp/row_symbols4.xml
@@ -22,17 +22,17 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Row
- latin:keyWidth="8.9%p"
+ latin:keyWidth="8.5%p"
>
<Key
latin:keyStyle="toAlphaKeyStyle"
- latin:keyWidth="13.0%p" />
+ latin:keyWidth="11.75%p" />
<Key
latin:keyStyle="smileyKeyStyle" />
<Key
latin:keyLabel="\@" />
<include
- latin:keyXPos="30.750%p"
+ latin:keyXPos="28.75%p"
latin:keyboardLayout="@xml/key_space" />
<Key
latin:keyLabel="""
@@ -40,7 +40,7 @@
<Key
latin:keyLabel="_" />
<include
- latin:keyXPos="-10.0%p"
+ latin:keyXPos="-8.5%p"
latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
diff --git a/java/res/xml-sw600dp/row_symbols_shift4.xml b/java/res/xml-sw600dp/row_symbols_shift4.xml
index 23db193..ffb6e7f 100644
--- a/java/res/xml-sw600dp/row_symbols_shift4.xml
+++ b/java/res/xml-sw600dp/row_symbols_shift4.xml
@@ -22,18 +22,18 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Row
- latin:keyWidth="8.9%p"
+ latin:keyWidth="8.5%p"
>
<Key
latin:keyStyle="toAlphaKeyStyle"
- latin:keyWidth="13.0%p" />
+ latin:keyWidth="11.75%p" />
<Key
latin:keyStyle="smileyKeyStyle" />
<include
- latin:keyXPos="30.750%p"
+ latin:keyXPos="28.75%p"
latin:keyboardLayout="@xml/key_space" />
<include
- latin:keyXPos="-10.00%p"
+ latin:keyXPos="-8.5%p"
latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
diff --git a/java/res/xml-sw600dp/rows_georgian.xml b/java/res/xml-sw600dp/rows_georgian.xml
index 2e166bd..89ef09f 100644
--- a/java/res/xml-sw600dp/rows_georgian.xml
+++ b/java/res/xml-sw600dp/rows_georgian.xml
@@ -24,7 +24,7 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_georgian1"
@@ -34,28 +34,28 @@
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_georgian2"
- latin:keyXPos="4.5%p" />
+ latin:keyXPos="5.875%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="10.0%p" />
+ latin:keyWidth="11.75%p" />
<include
latin:keyboardLayout="@xml/rowkeys_georgian3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyXPos="-9.0%p"
+ latin:keyXPos="-11.75%p"
latin:keyWidth="fillRight" />
</Row>
<include
diff --git a/java/res/xml-sw600dp/rows_greek.xml b/java/res/xml-sw600dp/rows_greek.xml
index 85d5c8a..24cbd62 100644
--- a/java/res/xml-sw600dp/rows_greek.xml
+++ b/java/res/xml-sw600dp/rows_greek.xml
@@ -24,7 +24,7 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/key_greek_semicolon" />
@@ -36,28 +36,28 @@
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_greek2"
- latin:keyXPos="4.5%p" />
+ latin:keyXPos="5.875%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="10.0%p" />
+ latin:keyWidth="11.75%p" />
<include
latin:keyboardLayout="@xml/rowkeys_greek3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyXPos="-9.0%p"
+ latin:keyXPos="-11.75%p"
latin:keyWidth="fillRight" />
</Row>
<include
diff --git a/java/res/xml-sw600dp/rows_qwerty.xml b/java/res/xml-sw600dp/rows_qwerty.xml
index 9fc0e12..29aea3f 100644
--- a/java/res/xml-sw600dp/rows_qwerty.xml
+++ b/java/res/xml-sw600dp/rows_qwerty.xml
@@ -24,7 +24,7 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_qwerty1"
@@ -34,28 +34,28 @@
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_qwerty2"
- latin:keyXPos="4.5%p" />
+ latin:keyXPos="5.875%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="10.0%p" />
+ latin:keyWidth="11.75%p" />
<include
latin:keyboardLayout="@xml/rowkeys_qwerty3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyXPos="-9.0%p"
+ latin:keyXPos="-11.75%p"
latin:keyWidth="fillRight" />
</Row>
<include
diff --git a/java/res/xml-sw600dp/rows_qwertz.xml b/java/res/xml-sw600dp/rows_qwertz.xml
index de86444..abbc7db 100644
--- a/java/res/xml-sw600dp/rows_qwertz.xml
+++ b/java/res/xml-sw600dp/rows_qwertz.xml
@@ -24,7 +24,7 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_qwertz1"
@@ -34,28 +34,28 @@
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_qwerty2"
- latin:keyXPos="4.5%p" />
+ latin:keyXPos="5.875%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="10.0%p" />
+ latin:keyWidth="11.75%p" />
<include
latin:keyboardLayout="@xml/rowkeys_qwertz3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyXPos="-9.0%p"
+ latin:keyXPos="-11.75%p"
latin:keyWidth="fillRight" />
</Row>
<include
diff --git a/java/res/xml-sw600dp/rows_symbols.xml b/java/res/xml-sw600dp/rows_symbols.xml
index ada22df..57ec70d 100644
--- a/java/res/xml-sw600dp/rows_symbols.xml
+++ b/java/res/xml-sw600dp/rows_symbols.xml
@@ -26,7 +26,7 @@
<include
latin:keyboardLayout="@xml/key_styles_currency" />
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_symbols1" />
@@ -35,26 +35,26 @@
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_symbols2"
- latin:keyXPos="4.5%p" />
+ latin:keyXPos="5.875%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<Key
latin:keyStyle="toMoreSymbolKeyStyle"
- latin:keyWidth="10.0%p" />
+ latin:keyWidth="11.75%p" />
<include
latin:keyboardLayout="@xml/rowkeys_symbols3" />
<Key
- latin:keyLabel="/"
- latin:keyXPos="-9.0%p"
+ latin:keyStyle="toMoreSymbolKeyStyle"
+ latin:keyXPos="-11.75%p"
latin:keyWidth="fillRight" />
</Row>
<include
diff --git a/java/res/xml-sw600dp/rows_symbols_shift.xml b/java/res/xml-sw600dp/rows_symbols_shift.xml
index 0750670..c46661e 100644
--- a/java/res/xml-sw600dp/rows_symbols_shift.xml
+++ b/java/res/xml-sw600dp/rows_symbols_shift.xml
@@ -26,7 +26,7 @@
<include
latin:keyboardLayout="@xml/key_styles_currency" />
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_symbols_shift1" />
@@ -35,23 +35,27 @@
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_symbols_shift2"
- latin:keyXPos="4.5%p" />
+ latin:keyXPos="5.875%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<Key
latin:keyStyle="backFromMoreSymbolKeyStyle"
- latin:keyWidth="10.0%p" />
+ latin:keyWidth="11.75%p" />
<include
latin:keyboardLayout="@xml/rowkeys_symbols_shift3" />
+ <Key
+ latin:keyStyle="backFromMoreSymbolKeyStyle"
+ latin:keyXPos="-11.75%p"
+ latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_symbols_shift4" />