Remove Key edge flags from XML
The first key and the last of the row are automatically marked as left
and right edge key respectively. The existence of Spacer will prevent
those automatic marking.
Bug: 5038844
Change-Id: Ie34169ceaf76e24923b8d8125eda6ecb95cf1fee
diff --git a/java/res/xml-sw600dp/kbd_number.xml b/java/res/xml-sw600dp/kbd_number.xml
index b3a1010..46114de 100644
--- a/java/res/xml-sw600dp/kbd_number.xml
+++ b/java/res/xml-sw600dp/kbd_number.xml
@@ -30,11 +30,12 @@
<case
latin:passwordInput="true"
>
- <!-- This row is intentionally not marked as a top row -->
<Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="24.875%p" />
<Key
- latin:keyStyle="num1KeyStyle"
- latin:keyXPos="24.875%p" />
+ latin:keyStyle="num1KeyStyle" />
<Key
latin:keyStyle="num2KeyStyle" />
<Key
@@ -42,13 +43,14 @@
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-11.00%p"
- latin:keyWidth="fillRight"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillRight" />
</Row>
<Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="24.875%p" />
<Key
- latin:keyStyle="num4KeyStyle"
- latin:keyXPos="24.875%p" />
+ latin:keyStyle="num4KeyStyle" />
<Key
latin:keyStyle="num5KeyStyle" />
<Key
@@ -56,24 +58,26 @@
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-11.00%p"
- latin:keyWidth="fillRight"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillRight" />
</Row>
<Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="24.875%p" />
<Key
- latin:keyStyle="num7KeyStyle"
- latin:keyXPos="24.875%p" />
+ latin:keyStyle="num7KeyStyle" />
<Key
latin:keyStyle="num8KeyStyle" />
<Key
latin:keyStyle="num9KeyStyle" />
+ <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
+ <Spacer
+ latin:keyWidth="0%p" />
</Row>
- <!-- This row is intentionally not marked as a bottom row -->
<Row>
<Key
latin:keyStyle="tabKeyStyle"
- latin:keyWidth="11.00%p"
- latin:keyEdgeFlags="left" />
+ latin:keyWidth="11.00%p" />
<Spacer
latin:keyXPos="24.875%p" />
<Key
@@ -87,12 +91,13 @@
</case>
<!-- latin:passwordInput="false" -->
<default>
- <!-- This row is intentionally not marked as a top row -->
<Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="11.00%p" />
<Key
latin:keyLabel="-"
latin:keyStyle="numKeyStyle"
- latin:keyXPos="11.00%p"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel="+"
@@ -115,13 +120,14 @@
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-11.00%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="11.00%p" />
<Key
latin:keyStyle="numStarKeyStyle"
- latin:keyXPos="11.00%p"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel="/"
@@ -144,17 +150,15 @@
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-11.00%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row>
- <!-- There is an empty area below 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. -->
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="11.00%p" />
<Key
latin:keyLabel="("
latin:keyStyle="numKeyStyle"
- latin:keyXPos="11.00%p"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel=")"
@@ -174,13 +178,14 @@
<Key
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" />
</Row>
- <!-- This row is intentionally not marked as a bottom row -->
<Row>
<Key
latin:keyStyle="tabKeyStyle"
- latin:keyWidth="11.00%p"
- latin:keyEdgeFlags="left" />
+ latin:keyWidth="11.00%p" />
<Key
latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
latin:keyWidth="27.75%p" />
diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml
index dd53a20..7b584c1 100644
--- a/java/res/xml-sw600dp/kbd_phone.xml
+++ b/java/res/xml-sw600dp/kbd_phone.xml
@@ -26,12 +26,13 @@
latin:keyboardLayout="@xml/kbd_key_styles" />
<include
latin:keyboardLayout="@xml/kbd_numkey_styles" />
- <!-- This row is intentionally not marked as a top row -->
<Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="15.625%p" />
<Key
latin:keyLabel="-"
latin:keyStyle="numKeyStyle"
- latin:keyXPos="15.625%p"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel="+"
@@ -47,14 +48,15 @@
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-11.00%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="15.625%p" />
<Key
latin:keyLabel=","
latin:keyStyle="numKeyStyle"
- latin:keyXPos="15.625%p"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel="."
@@ -70,16 +72,12 @@
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-11.00%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row>
<Key
latin:keyStyle="moreKeyStyle"
- latin:keyWidth="11.0%p"
- latin:keyEdgeFlags="left" />
- <!-- There is an empty area below 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. -->
+ latin:keyWidth="11.0%p" />
<Key
latin:keyLabel="("
latin:keyStyle="numKeyStyle"
@@ -96,13 +94,14 @@
latin:keyStyle="num8KeyStyle" />
<Key
latin:keyStyle="num9KeyStyle" />
+ <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
+ <Spacer
+ latin:keyWidth="0%p" />
</Row>
- <!-- This row is intentionally not marked as a bottom row -->
<Row>
<Key
latin:keyStyle="tabKeyStyle"
- latin:keyWidth="11.00%p"
- latin:keyEdgeFlags="left" />
+ latin:keyWidth="11.00%p" />
<Key
latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
latin:keyXPos="15.625%p"
diff --git a/java/res/xml-sw600dp/kbd_phone_symbols.xml b/java/res/xml-sw600dp/kbd_phone_symbols.xml
index d083ecb..4839645 100644
--- a/java/res/xml-sw600dp/kbd_phone_symbols.xml
+++ b/java/res/xml-sw600dp/kbd_phone_symbols.xml
@@ -26,12 +26,13 @@
latin:keyboardLayout="@xml/kbd_key_styles" />
<include
latin:keyboardLayout="@xml/kbd_numkey_styles" />
- <!-- This row is intentionally not marked as a top row -->
<Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="11.00%p" />
<Key
latin:keyLabel="-"
latin:keyStyle="numKeyStyle"
- latin:keyXPos="11.00%p"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel="+"
@@ -51,14 +52,15 @@
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-11.00%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="11.00%p" />
<Key
latin:keyLabel=","
latin:keyStyle="numKeyStyle"
- latin:keyXPos="11.00%p"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel="."
@@ -78,16 +80,12 @@
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-11.00%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row>
<Key
latin:keyStyle="moreKeyStyle"
- latin:keyWidth="11.00%p"
- latin:keyEdgeFlags="left" />
- <!-- There is an empty area below 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. -->
+ latin:keyWidth="11.00%p" />
<Key
latin:keyLabel="("
latin:keyStyle="numKeyStyle"
@@ -107,13 +105,14 @@
latin:keyStyle="num8KeyStyle" />
<Key
latin:keyStyle="num9KeyStyle" />
+ <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
+ <Spacer
+ latin:keyWidth="0%p" />
</Row>
- <!-- This row is intentionally not marked as a bottom row -->
<Row>
<Key
latin:keyStyle="tabKeyStyle"
- latin:keyWidth="11.00%p"
- latin:keyEdgeFlags="left" />
+ latin:keyWidth="11.00%p" />
<Key
latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
latin:keyWidth="27.75%p" />
diff --git a/java/res/xml-sw600dp/kbd_qwerty_f2.xml b/java/res/xml-sw600dp/kbd_qwerty_f2.xml
index 7638ee4..3ea1180 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_f2.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_f2.xml
@@ -27,8 +27,7 @@
>
<Key
latin:keyStyle="settingsKeyStyle"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</case>
<case
latin:f2KeyMode="shortcutIme"
@@ -39,8 +38,7 @@
>
<Key
latin:keyStyle="shortcutKeyStyle"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</case>
<!-- voiceKeyEnabled="false" -->
<default>
@@ -57,15 +55,13 @@
>
<Key
latin:keyStyle="shortcutKeyStyle"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</case>
<!-- voiceKeyEnabled="false" -->
<default>
<Key
latin:keyStyle="settingsKeyStyle"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</default>
</switch>
</case>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row1.xml b/java/res/xml-sw600dp/kbd_qwerty_row1.xml
index b781d68..c7dfcc8 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row1.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row1.xml
@@ -23,12 +23,10 @@
>
<Row
latin:keyWidth="9.0%p"
- latin:rowEdgeFlags="top"
>
<Key
latin:keyLabel="q"
- latin:popupCharacters="@string/alternates_for_q"
- latin:keyEdgeFlags="left" />
+ latin:popupCharacters="@string/alternates_for_q" />
<Key
latin:keyLabel="w"
latin:popupCharacters="@string/alternates_for_w" />
@@ -59,7 +57,6 @@
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row2.xml b/java/res/xml-sw600dp/kbd_qwerty_row2.xml
index 05b005a..78004fe 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row2.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row2.xml
@@ -27,8 +27,7 @@
<Key
latin:keyLabel="a"
latin:popupCharacters="@string/alternates_for_a"
- latin:keyXPos="4.5%p"
- latin:keyEdgeFlags="left" />
+ latin:keyXPos="4.5%p" />
<Key
latin:keyLabel="s"
latin:popupCharacters="@string/alternates_for_s" />
@@ -53,7 +52,6 @@
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-14.6%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row3.xml b/java/res/xml-sw600dp/kbd_qwerty_row3.xml
index b4eed8a..456f3c8 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row3.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row3.xml
@@ -26,8 +26,7 @@
>
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="10.0%p"
- latin:keyEdgeFlags="left" />
+ latin:keyWidth="10.0%p" />
<Key
latin:keyLabel="z"
latin:popupCharacters="@string/alternates_for_z" />
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row4.xml b/java/res/xml-sw600dp/kbd_qwerty_row4.xml
index 5cd47d9..f22b69f 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row4.xml
@@ -21,15 +21,13 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <!-- This row is intentionally not marked as a bottom row -->
<Row
latin:keyWidth="8.9%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelOption="alignLeft"
- latin:keyWidth="13.0%p"
- latin:keyEdgeFlags="left" />
+ latin:keyWidth="13.0%p" />
<Key
latin:keyStyle="tabKeyStyle" />
<switch>
diff --git a/java/res/xml-sw600dp/kbd_row3_smiley.xml b/java/res/xml-sw600dp/kbd_row3_smiley.xml
index 5e9584f..0ae3ae4 100644
--- a/java/res/xml-sw600dp/kbd_row3_smiley.xml
+++ b/java/res/xml-sw600dp/kbd_row3_smiley.xml
@@ -28,8 +28,7 @@
<Key
latin:keyLabel="\@"
latin:keyXPos="-8.9%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</case>
<case
latin:mode="url"
@@ -40,8 +39,7 @@
latin:keyHintLabel="_"
latin:popupCharacters="_"
latin:keyXPos="-8.9%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</case>
<case
latin:imeAction="actionSearch"
@@ -52,15 +50,13 @@
latin:keyHintLabel="+"
latin:popupCharacters="+"
latin:keyXPos="-8.9%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</case>
<default>
<Key
latin:keyStyle="smileyKeyStyle"
latin:keyXPos="-8.9%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</default>
</switch>
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_arabic.xml b/java/res/xml-sw600dp/kbd_rows_arabic.xml
index 4c19094..4c20f51 100644
--- a/java/res/xml-sw600dp/kbd_rows_arabic.xml
+++ b/java/res/xml-sw600dp/kbd_rows_arabic.xml
@@ -27,8 +27,7 @@
latin:keyWidth="8.0%p"
>
<Key
- latin:keyLabel="ض"
- latin:keyEdgeFlags="left" />
+ latin:keyLabel="ض" />
<Key
latin:keyLabel="ص" />
<Key
@@ -57,8 +56,7 @@
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.0%p"
@@ -105,8 +103,7 @@
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-14.6%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.0%p"
@@ -117,8 +114,7 @@
latin:mode="email"
>
<Key
- latin:keyLabel="\@"
- latin:keyEdgeFlags="left" />
+ latin:keyLabel="\@" />
</case>
<case
latin:mode="url"
@@ -127,8 +123,7 @@
latin:keyLabel="-"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="_"
- latin:popupCharacters="_"
- latin:keyEdgeFlags="left" />
+ latin:popupCharacters="_" />
</case>
<case
latin:imeAction="actionSearch"
@@ -137,13 +132,11 @@
latin:keyLabel=":"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="+"
- latin:popupCharacters="+"
- latin:keyEdgeFlags="left" />
+ latin:popupCharacters="+" />
</case>
<default>
<Key
- latin:keyStyle="smileyKeyStyle"
- latin:keyEdgeFlags="left" />
+ latin:keyStyle="smileyKeyStyle" />
</default>
</switch>
<Key
diff --git a/java/res/xml-sw600dp/kbd_rows_azerty.xml b/java/res/xml-sw600dp/kbd_rows_azerty.xml
index 698ef22..406b4e6 100644
--- a/java/res/xml-sw600dp/kbd_rows_azerty.xml
+++ b/java/res/xml-sw600dp/kbd_rows_azerty.xml
@@ -25,12 +25,10 @@
latin:keyboardLayout="@xml/kbd_key_styles" />
<Row
latin:keyWidth="8.5%p"
- latin:rowEdgeFlags="top"
>
<Key
latin:keyLabel="a"
- latin:popupCharacters="@string/alternates_for_a"
- latin:keyEdgeFlags="left" />
+ latin:popupCharacters="@string/alternates_for_a" />
<Key
latin:keyLabel="z"
latin:popupCharacters="@string/alternates_for_z" />
@@ -61,8 +59,7 @@
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.5%p"
@@ -70,8 +67,7 @@
<Key
latin:keyLabel="q"
latin:popupCharacters="@string/alternates_for_q"
- latin:keyXPos="5.0%p"
- latin:keyEdgeFlags="left" />
+ latin:keyXPos="5.0%p" />
<Key
latin:keyLabel="s"
latin:popupCharacters="@string/alternates_for_s" />
@@ -98,16 +94,14 @@
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-14.6%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.5%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="10.0%p"
- latin:keyEdgeFlags="left" />
+ latin:keyWidth="10.0%p" />
<Key
latin:keyLabel="w"
latin:popupCharacters="@string/alternates_for_w" />
diff --git a/java/res/xml-sw600dp/kbd_rows_hebrew.xml b/java/res/xml-sw600dp/kbd_rows_hebrew.xml
index 8740915..fc2247c 100644
--- a/java/res/xml-sw600dp/kbd_rows_hebrew.xml
+++ b/java/res/xml-sw600dp/kbd_rows_hebrew.xml
@@ -25,7 +25,6 @@
latin:keyboardLayout="@xml/kbd_key_styles" />
<Row
latin:keyWidth="9.0%p"
- latin:rowEdgeFlags="top"
>
<include
latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
@@ -48,8 +47,7 @@
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-12.000%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="9.0%p"
@@ -89,8 +87,7 @@
>
<Key
latin:keyLabel="\@"
- latin:keyWidth="10.0%p"
- latin:keyEdgeFlags="left" />
+ latin:keyWidth="10.0%p" />
</case>
<case
latin:mode="url"
@@ -100,8 +97,7 @@
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="_"
latin:popupCharacters="_"
- latin:keyWidth="10.0%p"
- latin:keyEdgeFlags="left" />
+ latin:keyWidth="10.0%p" />
</case>
<case
latin:imeAction="actionSearch"
@@ -111,14 +107,12 @@
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="+"
latin:popupCharacters="+"
- latin:keyWidth="10.0%p"
- latin:keyEdgeFlags="left" />
+ latin:keyWidth="10.0%p" />
</case>
<default>
<Key
latin:keyStyle="smileyKeyStyle"
- latin:keyWidth="10.0%p"
- latin:keyEdgeFlags="left" />
+ latin:keyWidth="10.0%p" />
</default>
</switch>
<Key
@@ -146,8 +140,7 @@
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-10.400%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<include
latin:keyboardLayout="@xml/kbd_qwerty_row4" />
diff --git a/java/res/xml-sw600dp/kbd_rows_qwertz.xml b/java/res/xml-sw600dp/kbd_rows_qwertz.xml
index 7ec895e..3d177e7 100644
--- a/java/res/xml-sw600dp/kbd_rows_qwertz.xml
+++ b/java/res/xml-sw600dp/kbd_rows_qwertz.xml
@@ -25,12 +25,10 @@
latin:keyboardLayout="@xml/kbd_key_styles" />
<Row
latin:keyWidth="9.0%p"
- latin:rowEdgeFlags="top"
>
<Key
latin:keyLabel="q"
- latin:popupCharacters="@string/alternates_for_q"
- latin:keyEdgeFlags="left" />
+ latin:popupCharacters="@string/alternates_for_q" />
<Key
latin:keyLabel="w"
latin:popupCharacters="@string/alternates_for_w" />
@@ -61,8 +59,7 @@
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<include
latin:keyboardLayout="@xml/kbd_qwerty_row2" />
@@ -71,8 +68,7 @@
>
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="10.0%p"
- latin:keyEdgeFlags="left" />
+ latin:keyWidth="10.0%p" />
<Key
latin:keyLabel="y"
latin:popupCharacters="@string/alternates_for_y" />
diff --git a/java/res/xml-sw600dp/kbd_rows_russian.xml b/java/res/xml-sw600dp/kbd_rows_russian.xml
index 4452989..7588f6c 100644
--- a/java/res/xml-sw600dp/kbd_rows_russian.xml
+++ b/java/res/xml-sw600dp/kbd_rows_russian.xml
@@ -25,11 +25,9 @@
latin:keyboardLayout="@xml/kbd_key_styles" />
<Row
latin:keyWidth="7.60%p"
- latin:rowEdgeFlags="top"
>
<Key
- latin:keyLabel="й"
- latin:keyEdgeFlags="left" />
+ latin:keyLabel="й" />
<Key
latin:keyLabel="ц" />
<Key
@@ -56,8 +54,7 @@
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.60%p"
@@ -88,15 +85,13 @@
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-14.6%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.60%p"
>
<Key
- latin:keyStyle="shiftKeyStyle"
- latin:keyEdgeFlags="left" />
+ latin:keyStyle="shiftKeyStyle" />
<Key
latin:keyLabel="я" />
<Key
diff --git a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml b/java/res/xml-sw600dp/kbd_rows_scandinavian.xml
index 5ac2b36..5059137 100644
--- a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml
+++ b/java/res/xml-sw600dp/kbd_rows_scandinavian.xml
@@ -25,12 +25,10 @@
latin:keyboardLayout="@xml/kbd_key_styles" />
<Row
latin:keyWidth="7.9%p"
- latin:rowEdgeFlags="top"
>
<Key
latin:keyLabel="q"
- latin:popupCharacters="@string/alternates_for_q"
- latin:keyEdgeFlags="left" />
+ latin:popupCharacters="@string/alternates_for_q" />
<Key
latin:keyLabel="w"
latin:popupCharacters="@string/alternates_for_w" />
@@ -63,8 +61,7 @@
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.9%p"
@@ -72,8 +69,7 @@
<Key
latin:keyLabel="a"
latin:keyXPos="3.5%p"
- latin:popupCharacters="@string/alternates_for_a"
- latin:keyEdgeFlags="left" />
+ latin:popupCharacters="@string/alternates_for_a" />
<Key
latin:keyLabel="s"
latin:popupCharacters="@string/alternates_for_s" />
@@ -104,16 +100,14 @@
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-14.6%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.9%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="10.0%p"
- latin:keyEdgeFlags="left" />
+ latin:keyWidth="10.0%p" />
<Spacer
latin:keyWidth="4.35%p" />
<Key
diff --git a/java/res/xml-sw600dp/kbd_rows_serbian.xml b/java/res/xml-sw600dp/kbd_rows_serbian.xml
index 5d39fd4..db7560c 100644
--- a/java/res/xml-sw600dp/kbd_rows_serbian.xml
+++ b/java/res/xml-sw600dp/kbd_rows_serbian.xml
@@ -25,12 +25,10 @@
latin:keyboardLayout="@xml/kbd_key_styles" />
<Row
latin:keyWidth="8.0%p"
- latin:rowEdgeFlags="top"
>
<Key
latin:keyLabel="љ"
- latin:keyXPos="2.15%p"
- latin:keyEdgeFlags="left" />
+ latin:keyXPos="2.15%p" />
<Key
latin:keyLabel="њ" />
<Key
@@ -54,15 +52,13 @@
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.9%p"
>
<Key
- latin:keyLabel="а"
- latin:keyEdgeFlags="left" />
+ latin:keyLabel="а" />
<Key
latin:keyLabel="с" />
<Key
@@ -86,16 +82,14 @@
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-14.6%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.5%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="8.0%p"
- latin:keyEdgeFlags="left" />
+ latin:keyWidth="8.0%p" />
<Key
latin:keyLabel="ѕ" />
<Key
diff --git a/java/res/xml-sw600dp/kbd_rows_spanish.xml b/java/res/xml-sw600dp/kbd_rows_spanish.xml
index 7ef44bb..49243eb 100644
--- a/java/res/xml-sw600dp/kbd_rows_spanish.xml
+++ b/java/res/xml-sw600dp/kbd_rows_spanish.xml
@@ -31,8 +31,7 @@
<Key
latin:keyLabel="a"
latin:popupCharacters="@string/alternates_for_a"
- latin:keyXPos="5.0%p"
- latin:keyEdgeFlags="left" />
+ latin:keyXPos="5.0%p" />
<Key
latin:keyLabel="s"
latin:popupCharacters="@string/alternates_for_s" />
@@ -59,8 +58,7 @@
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-14.6%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<include
latin:keyboardLayout="@xml/kbd_qwerty_row3" />
diff --git a/java/res/xml-sw600dp/kbd_symbols.xml b/java/res/xml-sw600dp/kbd_symbols.xml
index 03d37b0..fc89cd3 100644
--- a/java/res/xml-sw600dp/kbd_symbols.xml
+++ b/java/res/xml-sw600dp/kbd_symbols.xml
@@ -25,14 +25,12 @@
latin:keyboardLayout="@xml/kbd_key_styles" />
<include
latin:keyboardLayout="@xml/kbd_currency_key_styles" />
- <!-- This row is intentionally not marked as a top row -->
<Row
latin:keyWidth="9.0%p"
>
<Key
latin:keyLabel="@string/keylabel_for_symbols_1"
- latin:popupCharacters="@string/alternates_for_symbols_1"
- latin:keyEdgeFlags="left" />
+ latin:popupCharacters="@string/alternates_for_symbols_1" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_2"
latin:popupCharacters="@string/alternates_for_symbols_2" />
@@ -63,8 +61,7 @@
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="9.0%p"
@@ -97,16 +94,14 @@
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-14.6%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.9%p"
>
<Key
latin:keyStyle="moreKeyStyle"
- latin:keyWidth="10.0%p"
- latin:keyEdgeFlags="left" />
+ latin:keyWidth="10.0%p" />
<Key
latin:keyLabel="<"
latin:popupCharacters="≤,«,‹" />
@@ -147,15 +142,13 @@
latin:keyLabel="/"
latin:keyWidth="fillRight" />
</Row>
- <!-- This row is intentionally not marked as a bottom row -->
<Row
latin:keyWidth="8.9%p"
>
<Key
latin:keyStyle="toAlphaKeyStyle"
latin:keyLabelOption="alignLeft"
- latin:keyWidth="13.0%p"
- latin:keyEdgeFlags="left" />
+ latin:keyWidth="13.0%p" />
<Key
latin:keyStyle="tabKeyStyle" />
<Key
diff --git a/java/res/xml-sw600dp/kbd_symbols_shift.xml b/java/res/xml-sw600dp/kbd_symbols_shift.xml
index b25292f..99b78a4 100644
--- a/java/res/xml-sw600dp/kbd_symbols_shift.xml
+++ b/java/res/xml-sw600dp/kbd_symbols_shift.xml
@@ -23,7 +23,6 @@
>
<include
latin:keyboardLayout="@xml/kbd_key_styles" />
- <!-- This row is intentionally not marked as a top row -->
<Row
latin:keyWidth="9.0%p"
>
@@ -60,8 +59,7 @@
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="9.0%p"
@@ -97,16 +95,14 @@
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-14.6%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
+ latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.9%p"
>
<Key
latin:keyStyle="moreKeyStyle"
- latin:keyWidth="10.0%p"
- latin:keyEdgeFlags="left" />
+ latin:keyWidth="10.0%p" />
<Key
latin:keyLabel="\\" />
<Key
@@ -132,15 +128,13 @@
latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="¿" />
</Row>
- <!-- This row is intentionally not marked as a bottom row -->
<Row
latin:keyWidth="8.9%p"
>
<Key
latin:keyStyle="toAlphaKeyStyle"
latin:keyLabelOption="alignLeft"
- latin:keyWidth="13.0%p"
- latin:keyEdgeFlags="left" />
+ latin:keyWidth="13.0%p" />
<Key
latin:keyStyle="tabKeyStyle" />
<Key