From 7ab9f601cc93335a29686044e38ddeb939693375 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 18 Jan 2011 14:08:40 +0900
Subject: Add settings key to table keyboard

Bug: 3351762

Change-Id: Ibee1cf42af2f53017d83034f069b19be6657acbb
---
 java/res/drawable-mdpi/sym_keyboard_settings_holo.png | Bin 0 -> 3448 bytes
 java/res/xml-xlarge/kbd_key_styles.xml                |  12 ++++++++++++
 java/res/xml-xlarge/kbd_number.xml                    |   5 ++++-
 java/res/xml-xlarge/kbd_phone.xml                     |   7 +++++--
 java/res/xml-xlarge/kbd_phone_symbols.xml             |   5 ++++-
 java/res/xml-xlarge/kbd_qwerty_row4.xml               |   4 +++-
 java/res/xml-xlarge/kbd_symbols.xml                   |   4 +++-
 java/res/xml-xlarge/kbd_symbols_shift.xml             |   4 +++-
 8 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 java/res/drawable-mdpi/sym_keyboard_settings_holo.png

(limited to 'java')

diff --git a/java/res/drawable-mdpi/sym_keyboard_settings_holo.png b/java/res/drawable-mdpi/sym_keyboard_settings_holo.png
new file mode 100644
index 000000000..ad7618fa0
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_settings_holo.png differ
diff --git a/java/res/xml-xlarge/kbd_key_styles.xml b/java/res/xml-xlarge/kbd_key_styles.xml
index efbad5bab..26659a2ad 100644
--- a/java/res/xml-xlarge/kbd_key_styles.xml
+++ b/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"
diff --git a/java/res/xml-xlarge/kbd_number.xml b/java/res/xml-xlarge/kbd_number.xml
index c2cbb31c4..875548ba7 100644
--- a/java/res/xml-xlarge/kbd_number.xml
+++ b/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" />
diff --git a/java/res/xml-xlarge/kbd_phone.xml b/java/res/xml-xlarge/kbd_phone.xml
index c320ebbbc..b9444ad50 100644
--- a/java/res/xml-xlarge/kbd_phone.xml
+++ b/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
diff --git a/java/res/xml-xlarge/kbd_phone_symbols.xml b/java/res/xml-xlarge/kbd_phone_symbols.xml
index da15b5ad0..690bcde0c 100644
--- a/java/res/xml-xlarge/kbd_phone_symbols.xml
+++ b/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" />
diff --git a/java/res/xml-xlarge/kbd_qwerty_row4.xml b/java/res/xml-xlarge/kbd_qwerty_row4.xml
index 98acfc162..9d0fd81c7 100644
--- a/java/res/xml-xlarge/kbd_qwerty_row4.xml
+++ b/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"
diff --git a/java/res/xml-xlarge/kbd_symbols.xml b/java/res/xml-xlarge/kbd_symbols.xml
index d804f7909..e56cc92d2 100644
--- a/java/res/xml-xlarge/kbd_symbols.xml
+++ b/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
diff --git a/java/res/xml-xlarge/kbd_symbols_shift.xml b/java/res/xml-xlarge/kbd_symbols_shift.xml
index db33aaaca..f7cf24a3f 100644
--- a/java/res/xml-xlarge/kbd_symbols_shift.xml
+++ b/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" />
-- 
cgit v1.2.3-83-g751a