diff --git a/java/res/xml-sw600dp/key_colemak_semicolon.xml b/java/res/xml-sw600dp/key_colemak_colon.xml
similarity index 100%
rename from java/res/xml-sw600dp/key_colemak_semicolon.xml
rename to java/res/xml-sw600dp/key_colemak_colon.xml
diff --git a/java/res/xml-sw600dp/key_f1.xml b/java/res/xml-sw600dp/key_f1.xml
index e477d375873b9426892c7a700be0b979aa84d826..faf08755843f5bdf66ff10a989bc81c981b59035 100644
--- a/java/res/xml-sw600dp/key_f1.xml
+++ b/java/res/xml-sw600dp/key_f1.xml
@@ -23,13 +23,7 @@
>
<switch>
<case
- latin:mode="email"
- >
- <Key
- latin:keyStyle="comKeyStyle" />
- </case>
- <case
- latin:mode="url"
+ latin:mode="email|url"
>
<Key
latin:keyStyle="comKeyStyle" />
diff --git a/java/res/xml-sw600dp/key_shortcut.xml b/java/res/xml-sw600dp/key_shortcut.xml
index f8cbdf6b6983574d22251d84b3b3cae772bcea82..87fc75cd57fdabd7a1b36c985b6304abebfab96d 100644
--- a/java/res/xml-sw600dp/key_shortcut.xml
+++ b/java/res/xml-sw600dp/key_shortcut.xml
@@ -29,24 +29,21 @@
<Key
latin:keyStyle="shortcutKeyStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/settings_as_more_key"
- latin:keyWidth="fillBoth" />
+ latin:moreKeys="!text/settings_as_more_key" />
</case>
<case
latin:shortcutKeyEnabled="true"
latin:clobberSettingsKey="true"
>
<Key
- latin:keyStyle="shortcutKeyStyle"
- latin:keyWidth="fillBoth" />
+ latin:keyStyle="shortcutKeyStyle" />
</case>
<case
latin:shortcutKeyEnabled="false"
latin:clobberSettingsKey="false"
>
<Key
- latin:keyStyle="settingsKeyStyle"
- latin:keyWidth="fillBoth" />
+ latin:keyStyle="settingsKeyStyle" />
</case>
<!-- shortcutKeyEnabled="false" clobberSettingsKey="true" -->
<default>
diff --git a/java/res/xml-sw600dp/key_space.xml b/java/res/xml-sw600dp/key_space.xml
index 4670142ccfa5c029408f95e124bc9de12942ab20..4e1e15b55e9e9db20af1038aeda153a1ce2de6e7 100644
--- a/java/res/xml-sw600dp/key_space.xml
+++ b/java/res/xml-sw600dp/key_space.xml
@@ -21,9 +21,6 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <Spacer
- latin:keyWidth="0dp"
- latin:keyXPos="30.750%p" />
<switch>
<case
latin:languageCode="fa"
diff --git a/java/res/xml-sw600dp/row_dvorak4.xml b/java/res/xml-sw600dp/row_dvorak4.xml
index 7d365883a7ea8024b0c7ae9e8a109c5a1d20724f..14a5fd81d2b3a6a5a68c8889fd3097f5f68f45ea 100644
--- a/java/res/xml-sw600dp/row_dvorak4.xml
+++ b/java/res/xml-sw600dp/row_dvorak4.xml
@@ -32,15 +32,15 @@
<include
latin:keyboardLayout="@xml/key_f1" />
<include
+ latin:keyXPos="30.750%p"
latin:keyboardLayout="@xml/key_space" />
<include
latin:keyboardLayout="@xml/key_question_exclamation" />
<include
latin:keyboardLayout="@xml/key_dash" />
- <Spacer
- latin:keyXPos="-10.00%p"
- latin:keyWidth="0%p" />
<include
+ latin:keyXPos="-10.00%p"
+ latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/row_hebrew4.xml b/java/res/xml-sw600dp/row_hebrew4.xml
index e44d7d280c690f0580770ac3bb5aba9be3ef3344..536b653972d4d654a4543f09e9b8f1062b89f928 100644
--- a/java/res/xml-sw600dp/row_hebrew4.xml
+++ b/java/res/xml-sw600dp/row_hebrew4.xml
@@ -35,10 +35,9 @@
latin:keyboardLayout="@xml/key_space" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
- <Spacer
- latin:keyXPos="-10.00%p"
- latin:keyWidth="0%p" />
<include
+ latin:keyXPos="-10.0%p"
+ latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/row_qwerty4.xml b/java/res/xml-sw600dp/row_qwerty4.xml
index 58610ae15b3124e2cfefb99ce4745bfa6f6ce47e..76ac3a0d05b871f2ee0127f787fcd50f144503b6 100644
--- a/java/res/xml-sw600dp/row_qwerty4.xml
+++ b/java/res/xml-sw600dp/row_qwerty4.xml
@@ -32,15 +32,15 @@
<include
latin:keyboardLayout="@xml/key_f1" />
<include
+ latin:keyXPos="30.750%p"
latin:keyboardLayout="@xml/key_space" />
<include
latin:keyboardLayout="@xml/key_apostrophe" />
<include
latin:keyboardLayout="@xml/key_dash" />
- <Spacer
- latin:keyXPos="-10.00%p"
- latin:keyWidth="0%p" />
<include
+ latin:keyXPos="-10.00%p"
+ latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/row_symbols4.xml b/java/res/xml-sw600dp/row_symbols4.xml
index 9b6daab365637c30c3d6851b52bf926ce61190b8..d294e20cfcd66cee693dced957cc5f1ba6fabdc6 100644
--- a/java/res/xml-sw600dp/row_symbols4.xml
+++ b/java/res/xml-sw600dp/row_symbols4.xml
@@ -32,16 +32,16 @@
<Key
latin:keyLabel="\@" />
<include
+ latin:keyXPos="30.750%p"
latin:keyboardLayout="@xml/key_space" />
<Key
latin:keyLabel="""
latin:moreKeys="!text/more_keys_for_tablet_double_quote" />
<Key
latin:keyLabel="_" />
- <Spacer
- latin:keyXPos="-10.00%p"
- latin:keyWidth="0%p" />
<include
+ latin:keyXPos="-10.0%p"
+ latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/row_symbols_shift4.xml b/java/res/xml-sw600dp/row_symbols_shift4.xml
index 7823561ebdbd2c4bce9faffe3f3ab41d8e16c30a..3a78c72000415eb5ddb74401c142062fff6376f8 100644
--- a/java/res/xml-sw600dp/row_symbols_shift4.xml
+++ b/java/res/xml-sw600dp/row_symbols_shift4.xml
@@ -30,11 +30,11 @@
<Key
latin:keyStyle="tabKeyStyle" />
<include
+ latin:keyXPos="30.750%p"
latin:keyboardLayout="@xml/key_space" />
- <Spacer
- latin:keyXPos="-10.00%p"
- latin:keyWidth="0%p" />
<include
+ latin:keyXPos="-10.00%p"
+ latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/rows_colemak.xml b/java/res/xml-sw600dp/rows_colemak.xml
index 6c88e651700055dfb86c62578662494db3f0ecd3..aada5eb7a4e55f588da78a32b2dca0b8b9536096 100644
--- a/java/res/xml-sw600dp/rows_colemak.xml
+++ b/java/res/xml-sw600dp/rows_colemak.xml
@@ -30,7 +30,7 @@
latin:keyboardLayout="@xml/rowkeys_colemak1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<include
- latin:keyboardLayout="@xml/key_colemak_semicolon" />
+ latin:keyboardLayout="@xml/key_colemak_colon" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillBoth" />
diff --git a/java/res/xml-sw600dp/rows_hindi.xml b/java/res/xml-sw600dp/rows_hindi.xml
index 6c98e080e41b6c8f27275d13720d5325aad0fb18..f46c1debbfc1757b1eb3601b712adee258cd643c 100644
--- a/java/res/xml-sw600dp/rows_hindi.xml
+++ b/java/res/xml-sw600dp/rows_hindi.xml
@@ -38,7 +38,7 @@
>
<include
latin:keyboardLayout="@xml/rowkeys_hindi2"
- latin:keyXPos="4.500%p" />
+ latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" />
@@ -54,7 +54,9 @@
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<include
- latin:keyboardLayout="@xml/key_smiley" />
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyXPos="-7.5%p"
+ latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/java/res/xml-sw600dp/rows_nordic.xml b/java/res/xml-sw600dp/rows_nordic.xml
index 3a8aa1d330e33310b2c5e38848e95b2cd9363ae7..57104fa7dc43c51498dbb1d151535ab53af000ab 100644
--- a/java/res/xml-sw600dp/rows_nordic.xml
+++ b/java/res/xml-sw600dp/rows_nordic.xml
@@ -55,7 +55,7 @@
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-9.0%p"
+ latin:keyXPos="-7.6%p"
latin:keyWidth="fillRight" />
</Row>
<include
diff --git a/java/res/xml-sw600dp/rows_number_normal.xml b/java/res/xml-sw600dp/rows_number_normal.xml
index 3fda2aa13da3782c3d7cc04eb9fab83115fc125c..04d295336665694e0cc34c061eea2e919fc5f115 100644
--- a/java/res/xml-sw600dp/rows_number_normal.xml
+++ b/java/res/xml-sw600dp/rows_number_normal.xml
@@ -135,8 +135,7 @@
latin:keyLabel="9"
latin:keyStyle="numKeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
+ <Spacer />
</Row>
<Row>
<Key
@@ -155,10 +154,9 @@
<Key
latin:keyLabel="#"
latin:keyStyle="numKeyStyle" />
- <Spacer
- latin:keyXPos="-11.00%p"
- latin:keyWidth="0%p" />
<include
+ latin:keyXPos="-11.0%p"
+ latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/rows_number_password.xml b/java/res/xml-sw600dp/rows_number_password.xml
index 59279fb3bd7af8c7330b4b10ae1f06c1e976c0dc..2a2c33d9390ab246953eeb342b827199c30b2a63 100644
--- a/java/res/xml-sw600dp/rows_number_password.xml
+++ b/java/res/xml-sw600dp/rows_number_password.xml
@@ -62,8 +62,7 @@
<Key
latin:keyStyle="num9KeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
+ <Spacer />
</Row>
<Row>
<Key
@@ -72,10 +71,9 @@
<Key
latin:keyStyle="num0KeyStyle"
latin:keyXPos="42.50%p"/>
- <Spacer
- latin:keyXPos="-11.00%p"
- latin:keyWidth="0%p" />
<include
+ latin:keyXPos="-11.00%p"
+ latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/rows_phone.xml b/java/res/xml-sw600dp/rows_phone.xml
index e8926936f56e8865a739467f21f3e86f23ddc03a..687cadb879591674b96f58231841b8ae754b4f48 100644
--- a/java/res/xml-sw600dp/rows_phone.xml
+++ b/java/res/xml-sw600dp/rows_phone.xml
@@ -104,8 +104,7 @@
<Key
latin:keyStyle="num9KeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
+ <Spacer />
</Row>
<Row>
<Key
@@ -123,10 +122,9 @@
<Key
latin:keyLabel="#"
latin:keyStyle="numKeyStyle" />
- <Spacer
- latin:keyXPos="-11.00%p"
- latin:keyWidth="0%p" />
<include
+ latin:keyXPos="-11.0%p"
+ latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
diff --git a/java/res/xml-sw768dp/key_shortcut.xml b/java/res/xml-sw768dp/key_shortcut.xml
index 1e367a9d390bac3ef850551fbe1d016949b50152..905270599f4eea4d8aa8ae562e5848857cef1eb4 100644
--- a/java/res/xml-sw768dp/key_shortcut.xml
+++ b/java/res/xml-sw768dp/key_shortcut.xml
@@ -26,9 +26,7 @@
latin:shortcutKeyEnabled="true"
>
<Key
- latin:keyStyle="shortcutKeyStyle"
- latin:keyXPos="-8.047%p"
- latin:keyWidth="fillRight" />
+ latin:keyStyle="shortcutKeyStyle" />
</case>
</switch>
</merge>
diff --git a/java/res/xml-sw768dp/key_space.xml b/java/res/xml-sw768dp/key_space.xml
index f4d0480060f08c25757c7ec324306c28c3e554e6..36326c43760cede5f7aa450fdc05829a70892d5c 100644
--- a/java/res/xml-sw768dp/key_space.xml
+++ b/java/res/xml-sw768dp/key_space.xml
@@ -21,9 +21,6 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <Spacer
- latin:keyWidth="0dp"
- latin:keyXPos="31.250%p" />
<switch>
<case
latin:languageCode="fa"
diff --git a/java/res/xml-sw768dp/row_dvorak4.xml b/java/res/xml-sw768dp/row_dvorak4.xml
index f95661feb03f66bfa09a9af2be9f8e7fadf86bf1..251b4f5360dedfd30a518c6fa904b9330720e74c 100644
--- a/java/res/xml-sw768dp/row_dvorak4.xml
+++ b/java/res/xml-sw768dp/row_dvorak4.xml
@@ -26,18 +26,19 @@
>
<include
latin:keyboardLayout="@xml/key_settings" />
- <Spacer
- latin:keyXPos="15.157%p"
- latin:keyWidth="0%p" />
<include
+ latin:keyXPos="15.157%p"
latin:keyboardLayout="@xml/keys_f1f2" />
<include
+ latin:keyXPos="31.250%p"
latin:keyboardLayout="@xml/key_space" />
<include
latin:keyboardLayout="@xml/key_question_exclamation" />
<include
latin:keyboardLayout="@xml/key_dash" />
<include
+ latin:keyXPos="-8.047%p"
+ latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
diff --git a/java/res/xml-sw768dp/row_hebrew4.xml b/java/res/xml-sw768dp/row_hebrew4.xml
index e95d5fb71bb9609b9d11f988d584ea4cee5c1706..8ec7ea7b43b8f7ec3890e5b716e174f4c1ef582e 100644
--- a/java/res/xml-sw768dp/row_hebrew4.xml
+++ b/java/res/xml-sw768dp/row_hebrew4.xml
@@ -26,16 +26,16 @@
>
<include
latin:keyboardLayout="@xml/key_settings" />
- <Spacer
- latin:keyXPos="15.157%p"
- latin:keyWidth="0%p" />
<include
+ latin:keyXPos="15.157%p"
latin:keyboardLayout="@xml/keys_f1f2" />
<include
latin:keyboardLayout="@xml/key_space" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<include
+ latin:keyXPos="-8.047%p"
+ latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
diff --git a/java/res/xml-sw768dp/row_qwerty4.xml b/java/res/xml-sw768dp/row_qwerty4.xml
index b902d03ea230510160e81641df42078e14eae6d8..0cf964f50274838fc3b92e1be90ded448f2e717b 100644
--- a/java/res/xml-sw768dp/row_qwerty4.xml
+++ b/java/res/xml-sw768dp/row_qwerty4.xml
@@ -26,18 +26,19 @@
>
<include
latin:keyboardLayout="@xml/key_settings" />
- <Spacer
- latin:keyXPos="15.157%p"
- latin:keyWidth="0%p" />
<include
+ latin:keyXPos="15.157%p"
latin:keyboardLayout="@xml/keys_f1f2" />
<include
+ latin:keyXPos="31.250%p"
latin:keyboardLayout="@xml/key_space" />
<include
latin:keyboardLayout="@xml/key_apostrophe" />
<include
latin:keyboardLayout="@xml/key_dash" />
<include
+ latin:keyXPos="-8.047%p"
+ latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
diff --git a/java/res/xml-sw768dp/row_symbols4.xml b/java/res/xml-sw768dp/row_symbols4.xml
index 29845aae03eccadf8442ebee53f2809dac985ac1..167fc5e1d706f4c95af2b1b032941ace84f9ec75 100644
--- a/java/res/xml-sw768dp/row_symbols4.xml
+++ b/java/res/xml-sw768dp/row_symbols4.xml
@@ -32,21 +32,16 @@
<Key
latin:keyLabel="\@" />
<include
+ latin:keyXPos="31.250%p"
latin:keyboardLayout="@xml/key_space" />
<Key
latin:keyLabel="""
latin:moreKeys="!text/more_keys_for_tablet_double_quote" />
<Key
latin:keyLabel="_" />
- <switch>
- <case
- latin:shortcutKeyEnabled="true"
- >
- <Key
- latin:keyStyle="shortcutKeyStyle"
- latin:keyXPos="-8.047%p"
- latin:keyWidth="fillRight" />
- </case>
- </switch>
+ <include
+ latin:keyXPos="-8.047%p"
+ latin:keyWidth="fillRight"
+ latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
diff --git a/java/res/xml-sw768dp/row_symbols_shift4.xml b/java/res/xml-sw768dp/row_symbols_shift4.xml
index 6828fdb78d45c602b2f2deb9949c26fa2100d66e..683ec439f336c428d5e9a70b0e18954e13917fb5 100644
--- a/java/res/xml-sw768dp/row_symbols_shift4.xml
+++ b/java/res/xml-sw768dp/row_symbols_shift4.xml
@@ -27,16 +27,11 @@
<include
latin:keyboardLayout="@xml/key_settings" />
<include
+ latin:keyXPos="31.250%p"
latin:keyboardLayout="@xml/key_space" />
- <switch>
- <case
- latin:shortcutKeyEnabled="true"
- >
- <Key
- latin:keyStyle="shortcutKeyStyle"
- latin:keyXPos="-8.047%p"
- latin:keyWidth="fillRight" />
- </case>
- </switch>
+ <include
+ latin:keyXPos="-8.047%p"
+ latin:keyWidth="fillRight"
+ latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
diff --git a/java/res/xml-sw768dp/rows_colemak.xml b/java/res/xml-sw768dp/rows_colemak.xml
index e00448032e27bac8312e4a2f64e6d458270dadba..01ebead3e159a7198385eb0b7a046642a32b9251 100644
--- a/java/res/xml-sw768dp/rows_colemak.xml
+++ b/java/res/xml-sw768dp/rows_colemak.xml
@@ -34,7 +34,7 @@
latin:keyboardLayout="@xml/rowkeys_colemak1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<include
- latin:keyboardLayout="@xml/key_colemak_semicolon" />
+ latin:keyboardLayout="@xml/key_colemak_colon" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillBoth" />
diff --git a/java/res/xml-sw768dp/rows_number_normal.xml b/java/res/xml-sw768dp/rows_number_normal.xml
index 0d75a37d2ae0fa552619054661c14d80353baf50..42697cec1e688f04d0ce7e6677488589a9cb634a 100644
--- a/java/res/xml-sw768dp/rows_number_normal.xml
+++ b/java/res/xml-sw768dp/rows_number_normal.xml
@@ -137,8 +137,7 @@
latin:keyLabel="9"
latin:keyStyle="numKeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
+ <Spacer />
</Row>
<Row>
<include
@@ -157,20 +156,9 @@
<Key
latin:keyLabel="#"
latin:keyStyle="numKeyStyle" />
- <switch>
- <case
- latin:shortcutKeyEnabled="true"
- >
- <Key
- latin:keyStyle="shortcutKeyStyle"
- latin:keyXPos="-8.047%p"
- latin:keyWidth="fillRight" />
- </case>
- <default>
- <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
- </default>
- </switch>
+ <include
+ latin:keyXPos="-8.047%p"
+ latin:keyWidth="fillRight"
+ latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
diff --git a/java/res/xml-sw768dp/rows_number_password.xml b/java/res/xml-sw768dp/rows_number_password.xml
index 8acfac6ff415eef03c280126b4aca2b41bd9683e..cfa2214911cf6f3d42698df175462f18d8fdd8fb 100644
--- a/java/res/xml-sw768dp/rows_number_password.xml
+++ b/java/res/xml-sw768dp/rows_number_password.xml
@@ -64,16 +64,16 @@
<Key
latin:keyStyle="num9KeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
+ <Spacer />
</Row>
<Row>
- <Spacer
- latin:keyXPos="32.076%p" />
+ <include
+ latin:keyboardLayout="@xml/key_settings"
+ latin:keyWidth="8.047%p" />
<Key
+ latin:keyXPos="45.326%p"
latin:keyStyle="num0KeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
+ <Spacer />
</Row>
</merge>
diff --git a/java/res/xml-sw768dp/rows_phone.xml b/java/res/xml-sw768dp/rows_phone.xml
index 216fbedfb55cd8fca1de8ec98ed3b4ff93b3d9a9..b3b3521a9caac8735b5cbc08e9f415d78ba63828 100644
--- a/java/res/xml-sw768dp/rows_phone.xml
+++ b/java/res/xml-sw768dp/rows_phone.xml
@@ -106,8 +106,7 @@
<Key
latin:keyStyle="num9KeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
+ <Spacer />
</Row>
<Row>
<include
@@ -125,20 +124,9 @@
<Key
latin:keyLabel="#"
latin:keyStyle="numKeyStyle" />
- <switch>
- <case
- latin:shortcutKeyEnabled="true"
- >
- <Key
- latin:keyStyle="shortcutKeyStyle"
- latin:keyXPos="-8.047%p"
- latin:keyWidth="fillRight" />
- </case>
- <default>
- <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
- </default>
- </switch>
+ <include
+ latin:keyXPos="-8.047%p"
+ latin:keyWidth="fillRight"
+ latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
diff --git a/java/res/xml-sw768dp/rows_thai.xml b/java/res/xml-sw768dp/rows_thai.xml
index cc77f8bc57c8209a385916f7ea50c3509d46a05e..c7720c9c54a0ac9f2cf361efefa3603bc0d79745 100644
--- a/java/res/xml-sw768dp/rows_thai.xml
+++ b/java/res/xml-sw768dp/rows_thai.xml
@@ -28,7 +28,7 @@
>
<include
latin:keyboardLayout="@xml/rowkeys_thai1"
- latin:keyXPos="11.508%p"/>
+ latin:keyXPos="11.508%p" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillBoth"/>
diff --git a/java/res/xml/key_colemak_semicolon.xml b/java/res/xml/key_colemak_colon.xml
similarity index 100%
rename from java/res/xml/key_colemak_semicolon.xml
rename to java/res/xml/key_colemak_colon.xml
diff --git a/java/res/xml/key_space.xml b/java/res/xml/key_space.xml
index c47407dc7c4138ce55eb6d8bd1d2faaa7bba96e0..02ee42fd2783eaf174dfa482889be8479ca3e85b 100644
--- a/java/res/xml/key_space.xml
+++ b/java/res/xml/key_space.xml
@@ -21,9 +21,6 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <Spacer
- latin:keyWidth="0dp"
- latin:keyXPos="25%p" />
<switch>
<case
latin:languageCode="fa"
diff --git a/java/res/xml/row_dvorak4.xml b/java/res/xml/row_dvorak4.xml
index 7b9a59cde61e097736adf619a6e31979de38301f..f81fb007bf745b5cce55db2bae9a69376a6adac8 100644
--- a/java/res/xml/row_dvorak4.xml
+++ b/java/res/xml/row_dvorak4.xml
@@ -78,6 +78,7 @@
</default>
</switch>
<include
+ latin:keyXPos="25%p"
latin:keyboardLayout="@xml/key_space" />
<Key
latin:keyLabel="z"
diff --git a/java/res/xml/row_qwerty4.xml b/java/res/xml/row_qwerty4.xml
index 361a2c3ef693eae9a941947c72130548fbf6be59..678034960972bf025f594d167e9c320f2234f8e3 100644
--- a/java/res/xml/row_qwerty4.xml
+++ b/java/res/xml/row_qwerty4.xml
@@ -30,6 +30,7 @@
<include
latin:keyboardLayout="@xml/key_f1" />
<include
+ latin:keyXPos="25%p"
latin:keyboardLayout="@xml/key_space" />
<Key
latin:keyStyle="punctuationKeyStyle" />
diff --git a/java/res/xml/row_symbols4.xml b/java/res/xml/row_symbols4.xml
index a92d55a76b0b47f0f7f78e510520906cbb6e580c..150ad486c363fca6cea3e00172264defd6a99471 100644
--- a/java/res/xml/row_symbols4.xml
+++ b/java/res/xml/row_symbols4.xml
@@ -44,6 +44,7 @@
</default>
</switch>
<include
+ latin:keyXPos="25%p"
latin:keyboardLayout="@xml/key_space" />
<Key
latin:keyStyle="punctuationKeyStyle" />
diff --git a/java/res/xml/row_symbols_shift4.xml b/java/res/xml/row_symbols_shift4.xml
index 6608b77959cc902c5f4d0dfc5772b5b7cb3bacd2..1bfb5ecd18a03cab8a023e6b9ad835cdb3840b34 100644
--- a/java/res/xml/row_symbols_shift4.xml
+++ b/java/res/xml/row_symbols_shift4.xml
@@ -36,6 +36,7 @@
latin:keyLabel="„"
latin:backgroundType="functional" />
<include
+ latin:keyXPos="25%p"
latin:keyboardLayout="@xml/key_space" />
<!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
<Key
diff --git a/java/res/xml/rows_colemak.xml b/java/res/xml/rows_colemak.xml
index a1599650daf8c09df3b394fea5524bac0eda7c3b..d74c2c9ec0025da30e26b59bca29f5d98835e48d 100644
--- a/java/res/xml/rows_colemak.xml
+++ b/java/res/xml/rows_colemak.xml
@@ -29,7 +29,7 @@
<include
latin:keyboardLayout="@xml/rowkeys_colemak1" />
<include
- latin:keyboardLayout="@xml/key_colemak_semicolon" />
+ latin:keyboardLayout="@xml/key_colemak_colon" />
</Row>
<Row
latin:keyWidth="10%p"
diff --git a/java/res/xml/rows_number.xml b/java/res/xml/rows_number.xml
index 8da83be80b5b621974ca1e778619e98c5972f3eb..96564e8ff930e6fff14facb510ea59ebd915c1ad 100644
--- a/java/res/xml/rows_number.xml
+++ b/java/res/xml/rows_number.xml
@@ -20,7 +20,6 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyWidth="26.67%p"
>
<include
latin:keyboardLayout="@xml/key_styles_common" />