Fix wrong keyEdgeFlags in xlarge keyboard layouts

Bug: 3040988
Change-Id: Ibcac874a96ed0bf35350b50a5dd862a8d03c8354

java/res/xml-xlarge/kbd_qwerty.xml

@@ -26,6 +26,7 @@
     android:keyHeight="@dimen/key_height"
 >
     <Row>
+    <!-- This row is intentionally not marked as a top row -->
         <Key
             android:codes="@integer/key_tab"
             android:keyLabel="Tab"
@@ -34,8 +35,7 @@
         <Key
             android:keyLabel="q"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_q"
-            android:keyEdgeFlags="left" />
+            android:popupCharacters="@string/alternates_for_q" />
         <Key
             android:keyLabel="w"
             android:popupKeyboard="@xml/kbd_popup_template"
@@ -188,18 +188,17 @@
             android:isSticky="true"
             android:keyEdgeFlags="right" />
     </Row>
-    <Row
-        android:rowEdgeFlags="bottom"
-    >
+    <Row>
+    <!-- This row is intentionally not marked as a bottom row -->
         <Key
-            android:keyLabel="&lt;"
+            android:keyLabel="("
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="("
+            android:popupCharacters="&lt;"
             android:horizontalGap="16.25%p" />
         <Key
-            android:keyLabel="&gt;"
+            android:keyLabel=")"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters=")" />
+            android:popupCharacters="&gt;" />
         <Key
             android:codes="@integer/key_space"
             android:keyIcon="@drawable/sym_keyboard_space"

java/res/xml-xlarge/kbd_symbols.xml

@@ -25,9 +25,8 @@
     android:verticalGap="0px"
     android:keyHeight="@dimen/key_height"
 >
-    <Row
-        android:rowEdgeFlags="top"
-    >
+    <Row>
+    <!-- This row is intentionally not marked as a top row -->
         <Key
             android:codes="@integer/key_tab"
             android:keyLabel="Tab"
@@ -66,7 +65,7 @@
     <Row>
         <Key
             android:codes="@integer/key_symbol"
-            android:keyLabel="@string/label_symbol_key"
+            android:keyLabel="@string/label_alpha_key"
             android:keyWidth="8.75%p"
             android:isModifier="true"
             android:keyEdgeFlags="left" />
@@ -136,11 +135,10 @@
             android:keyWidth="12.5%p"
             android:isModifier="true"
             android:isSticky="true"
-            android:keyEdgeFlags="left" />
+            android:keyEdgeFlags="right" />
     </Row>
-    <Row
-        android:rowEdgeFlags="bottom"
-    >
+    <Row>
+    <!-- This row is intentionally not marked as a bottom row -->
         <Key
             android:keyLabel="&lt;"
             android:horizontalGap="16.25%p" />

java/res/xml-xlarge/kbd_symbols_shift.xml

@@ -25,9 +25,8 @@
     android:verticalGap="0px"
     android:keyHeight="@dimen/key_height"
 >
-    <Row
-        android:rowEdgeFlags="top"
-    >
+    <Row>
+    <!-- This row is intentionally not marked as a top row -->
         <Key
             android:codes="@integer/key_tab"
             android:keyLabel="Tab"
@@ -67,7 +66,7 @@
     <Row>
         <Key
             android:codes="@integer/key_symbol"
-            android:keyLabel="@string/label_symbol_key"
+            android:keyLabel="@string/label_alpha_key"
             android:keyWidth="8.75%p"
             android:isModifier="true"
             android:keyEdgeFlags="left" />
@@ -137,11 +136,10 @@
             android:keyWidth="12.5%p"
             android:isModifier="true"
             android:isSticky="true"
-            android:keyEdgeFlags="left" />
+            android:keyEdgeFlags="right" />
     </Row>
-    <Row
-        android:rowEdgeFlags="bottom"
-    >
+    <Row>
+    <!-- This row is intentionally not marked as a bottom row -->
         <Key
             android:keyLabel="≤"
             android:horizontalGap="16.25%p" />