commit d2c5fdda862f6dd2a1e020cf674c35fbbc63fc92
author Tadashi G. Takaoka <takaoka@google.com> Thu Apr 21 19:43:20 2011 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Thu Apr 21 20:32:33 2011 +0900
tree 068ab9daab91118763f757790e6dde0b112c5a94
parent c9c3aa219e56c4707215c28495210a2393ff50c7

Rename and reorganize key code

Change-Id: I13d6fef7af1c4356a22b0e8aebc9e613b1693ece

java/res/values/keycodes.xml

diff --git a/java/res/values/keycodes.xml b/java/res/values/keycodes.xml
index d6f9bfc..0f0a74a 100644
--- a/java/res/values/keycodes.xml
+++ b/java/res/values/keycodes.xml
@@ -26,8 +26,8 @@
     <integer name="key_shift">-1</integer>
     <integer name="key_switch_alpha_symbol">-2</integer>
     <integer name="key_delete">-5</integer>
-    <integer name="key_settings">-100</integer>
-    <integer name="key_voice">-102</integer>
+    <integer name="key_settings">-6</integer>
+    <integer name="key_shortcut">-8</integer>
 
     <!-- Array used for mapping key codes to description strings. -->
     <array name="key_descriptions">
@@ -45,7 +45,7 @@
         <item>@string/description_delete_key</item>
         <item>@integer/key_settings</item>
         <item>@string/description_settings_key</item>
-        <item>@integer/key_voice</item>
+        <item>@integer/key_shortcut</item>
         <item>@string/description_voice_key</item>
     </array>
 </resources>

java/res/xml-xlarge/kbd_key_styles.xml

diff --git a/java/res/xml-xlarge/kbd_key_styles.xml b/java/res/xml-xlarge/kbd_key_styles.xml
index 4fefe00..57eaccb 100644
--- a/java/res/xml-xlarge/kbd_key_styles.xml
+++ b/java/res/xml-xlarge/kbd_key_styles.xml
@@ -73,7 +73,7 @@
                 latin:parentStyle="functionalKeyStyle" />
             <key-style
                 latin:styleName="micKeyStyle"
-                latin:code="@integer/key_voice"
+                latin:code="@integer/key_shortcut"
                 latin:keyIcon="@drawable/sym_keyboard_voice_holo"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
                 latin:parentStyle="functionalKeyStyle" />
@@ -127,7 +127,7 @@
                 latin:parentStyle="functionalKeyStyle" />
             <key-style
                 latin:styleName="micKeyStyle"
-                latin:code="@integer/key_voice"
+                latin:code="@integer/key_shortcut"
                 latin:keyIcon="@drawable/sym_bkeyboard_mic"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
                 latin:parentStyle="functionalKeyStyle" />

java/res/xml/kbd_key_styles.xml

diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml
index bfc7c4f..4792e1f 100644
--- a/java/res/xml/kbd_key_styles.xml
+++ b/java/res/xml/kbd_key_styles.xml
@@ -118,7 +118,7 @@
                 latin:parentStyle="functionalKeyStyle" />
             <key-style
                 latin:styleName="micKeyStyle"
-                latin:code="@integer/key_voice"
+                latin:code="@integer/key_shortcut"
                 latin:keyIcon="@drawable/sym_keyboard_mic"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
                 latin:parentStyle="settingsPopupStyle" />
@@ -191,7 +191,7 @@
                 latin:parentStyle="functionalKeyStyle" />
             <key-style
                 latin:styleName="micKeyStyle"
-                latin:code="@integer/key_voice"
+                latin:code="@integer/key_shortcut"
                 latin:keyIcon="@drawable/sym_bkeyboard_mic"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
                 latin:parentStyle="settingsPopupStyle" />