Manual merge of the following Gingerbread changes logically

I8b38e280
Ia3929bb0
If925b546
I1062763d
I901e36aa

bug: 3100311
Change-Id: Ic7e01277ec816e77d34732599b2b9552668b81c2

1 files changed, 52 insertions, 57 deletions

diff --git a/java/res/xml/kbd_symbols_shift.xml b/java/res/xml/kbd_symbols_shift.xml
index d83706b5c..b8f8faeb2 100644
--- a/java/res/xml/kbd_symbols_shift.xml
+++ b/java/res/xml/kbd_symbols_shift.xml
@@ -122,68 +122,63 @@
             latin:keyEdgeFlags="right" />
     </Row>
     <Row
-        latin:keyboardMode="@+id/mode_symbols"
+        latin:keyboardMode="@+id/mode_symbols_normal"
         latin:rowEdgeFlags="bottom"
     >
-        <Key
-            latin:codes="@integer/key_symbol"
-            latin:keyLabel="@string/label_alpha_key"
-            latin:keyWidth="20%p"
-            latin:isModifier="true"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="„"
-            latin:isModifier="true" />
-        <Key
-            latin:codes="@integer/key_space"
-            latin:keyIcon="@drawable/sym_keyboard_space"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_space"
-            latin:keyWidth="40%p"
-            latin:isModifier="true" />
-        <Key
-            latin:keyLabel="…"
-            latin:isModifier="true" />
-        <Key
-            latin:codes="@integer/key_return"
-            latin:keyIcon="@drawable/sym_keyboard_return"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_return"
-            latin:keyWidth="20%p"
-            latin:isModifier="true"
-            latin:keyEdgeFlags="right" />
+        <include latin:keyboardLayout="@xml/kbd_symbols_shift_row4_common" />
     </Row>
     <Row
-        latin:keyboardMode="@+id/mode_symbols_with_settings_key"
+        latin:keyboardMode="@+id/mode_symbols_url"
         latin:rowEdgeFlags="bottom"
     >
-        <Key
-            latin:codes="@integer/key_symbol"
-            latin:keyLabel="@string/label_alpha_key"
-            latin:keyWidth="15%p"
-            latin:isModifier="true"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:codes="@integer/key_settings"
-            latin:keyIcon="@drawable/sym_keyboard_settings"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_settings"
-            latin:isModifier="true" />
-        <Key
-            latin:keyLabel="„"
-            latin:isModifier="true" />
-        <Key
-            latin:codes="@integer/key_space"
-            latin:keyIcon="@drawable/sym_keyboard_space"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_space"
-            latin:keyWidth="30%p"
-            latin:isModifier="true" />
-        <Key
-            latin:keyLabel="…"
-            latin:isModifier="true" />
-        <Key
-            latin:codes="@integer/key_return"
-            latin:keyIcon="@drawable/sym_keyboard_return"
-            latin:iconPreview="@drawable/sym_keyboard_feedback_return"
-            latin:keyWidth="25%p"
-            latin:isModifier="true"
-            latin:keyEdgeFlags="right" />
+        <include latin:keyboardLayout="@xml/kbd_symbols_shift_row4_common" />
+    </Row>
+    <Row
+        latin:keyboardMode="@+id/mode_symbols_email"
+        latin:rowEdgeFlags="bottom"
+    >
+        <include latin:keyboardLayout="@xml/kbd_symbols_shift_row4_common" />
+    </Row>
+    <Row
+        latin:keyboardMode="@+id/mode_symbols_im"
+        latin:rowEdgeFlags="bottom"
+    >
+        <include latin:keyboardLayout="@xml/kbd_symbols_shift_row4_im" />
+    </Row>
+    <Row
+        latin:keyboardMode="@+id/mode_symbols_webentry"
+        latin:rowEdgeFlags="bottom"
+    >
+        <include latin:keyboardLayout="@xml/kbd_symbols_shift_row4_common" />
+    </Row>
+    <Row
+        latin:keyboardMode="@+id/mode_symbols_normal_with_settings_key"
+        latin:rowEdgeFlags="bottom"
+    >
+        <include latin:keyboardLayout="@xml/kbd_symbols_shift_row4_common_with_settings_key" />
+    </Row>
+    <Row
+        latin:keyboardMode="@+id/mode_symbols_url_with_settings_key"
+        latin:rowEdgeFlags="bottom"
+    >
+        <include latin:keyboardLayout="@xml/kbd_symbols_shift_row4_common_with_settings_key" />
+    </Row>
+    <Row
+        latin:keyboardMode="@+id/mode_symbols_email_with_settings_key"
+        latin:rowEdgeFlags="bottom"
+    >
+        <include latin:keyboardLayout="@xml/kbd_symbols_shift_row4_common_with_settings_key" />
+    </Row>
+    <Row
+        latin:keyboardMode="@+id/mode_symbols_im_with_settings_key"
+        latin:rowEdgeFlags="bottom"
+    >
+        <include latin:keyboardLayout="@xml/kbd_symbols_shift_row4_im_with_settings_key" />
+    </Row>
+    <Row
+        latin:keyboardMode="@+id/mode_symbols_webentry_with_settings_key"
+        latin:rowEdgeFlags="bottom"
+    >
+        <include latin:keyboardLayout="@xml/kbd_symbols_shift_row4_common_with_settings_key" />
     </Row>
 </Keyboard>