Merge "Add settings key to table keyboard" into honeycomb

java/res/xml-xlarge/kbd_key_styles.xml

@@ -65,6 +65,12 @@
                 latin:keyHintIcon="@drawable/hint_popup_holo"
                 latin:popupCharacters="@string/alternates_for_smiley"
                 latin:maxPopupKeyboardColumn="5" />
+            <key-style
+                latin:styleName="settingsKeyStyle"
+                latin:code="@integer/key_settings"
+                latin:keyIcon="@drawable/sym_keyboard_settings_holo"
+                latin:iconPreview="@drawable/sym_keyboard_feedback_settings"
+                latin:parentStyle="functionalKeyStyle" />
             <key-style
                 latin:styleName="micKeyStyle"
                 latin:code="@integer/key_voice"
@@ -113,6 +119,12 @@
                 latin:keyHintIcon="@drawable/hint_popup_holo"
                 latin:popupCharacters="@string/alternates_for_smiley"
                 latin:maxPopupKeyboardColumn="5" />
+            <key-style
+                latin:styleName="settingsKeyStyle"
+                latin:code="@integer/key_settings"
+                latin:keyIcon="@drawable/sym_bkeyboard_settings"
+                latin:iconPreview="@drawable/sym_keyboard_feedback_settings"
+                latin:parentStyle="functionalKeyStyle" />
             <key-style
                 latin:styleName="micKeyStyle"
                 latin:code="@integer/key_voice"

java/res/xml-xlarge/kbd_number.xml

@@ -120,7 +120,10 @@
         <!-- There is an empty area bellow the "More" key and left of the "space" key.  To ignore
              the touch event on the area, "space" is intentionally not marked as a left edge key. -->
         <Spacer
-            latin:horizontalGap="16.406%p" />
+            latin:horizontalGap="8.362%p" />
+        <Key
+            latin:keyStyle="settingsKeyStyle"
+            latin:keyWidth="8.042%p" />
         <Key
             latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
             latin:keyWidth="24.127%p" />

java/res/xml-xlarge/kbd_phone.xml

@@ -128,10 +128,13 @@
         <!-- There is an empty area bellow the "More" key and left of the "space" key.  To ignore
              the touch event on the area, "space" is intentionally not marked as a left edge key. -->
         <Spacer
-            latin:horizontalGap="20.427%p" />
+            latin:horizontalGap="12.340%p" />
+        <Key
+            latin:keyStyle="settingsKeyStyle"
+            latin:keyWidth="8.042%p" />
         <Key
             latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
-            latin:keyWidth="16.085%p" />
+            latin:keyWidth="16.084%p" />
         <Spacer
             latin:horizontalGap="8.479%p" />
         <Key

java/res/xml-xlarge/kbd_phone_symbols.xml

@@ -140,7 +140,10 @@
         <!-- There is an empty area bellow the "More" key and left of the "space" key.  To ignore
              the touch event on the area, "space" is intentionally not marked as a left edge key. -->
         <Spacer
-            latin:horizontalGap="16.406%p" />
+            latin:horizontalGap="8.362%p" />
+        <Key
+            latin:keyStyle="settingsKeyStyle"
+            latin:keyWidth="8.042%p" />
         <Key
             latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
             latin:keyWidth="24.127%p" />

java/res/xml-xlarge/kbd_qwerty_row4.xml

@@ -26,7 +26,9 @@
         latin:keyWidth="8.042%p"
     >
         <Spacer
-            latin:horizontalGap="16.404%p" />
+            latin:horizontalGap="8.362%p" />
+        <Key
+            latin:keyStyle="settingsKeyStyle" />
         <switch>
             <case
                 latin:mode="email"

java/res/xml-xlarge/kbd_symbols.xml

@@ -149,7 +149,9 @@
         latin:keyWidth="8.042%p"
     >
         <Spacer
-            latin:horizontalGap="16.404%p" />
+            latin:horizontalGap="8.362%p" />
+        <Key
+            latin:keyStyle="settingsKeyStyle" />
         <Key
             latin:keyLabel="/" />
         <Key

java/res/xml-xlarge/kbd_symbols_shift.xml

@@ -135,7 +135,9 @@
         latin:keyWidth="8.042%p"
     >
         <Spacer
-            latin:horizontalGap="32.488%p" />
+            latin:horizontalGap="24.446%p" />
+        <Key
+            latin:keyStyle="settingsKeyStyle" />
         <Key
             latin:keyStyle="spaceKeyStyle"
             latin:keyWidth="37.454%p" />