commit 41398ba26527b13d287f856389d3489ec892ee82
author Tadashi G. Takaoka <takaoka@google.com> Thu Apr 26 15:14:25 2012 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Thu Apr 26 15:20:23 2012 +0900
tree e50d753873627f247dd7bf992dba10e98b27ac5c
parent 27b42ced86e1c85de3d59d91a9e5c577fa552569

Show settings key when noMicrophone option is enabled on PC QWERTY

Change-Id: Ib419a597e218af347e5d5da19f5ca8b3db8548c7

java/res/xml/key_styles_common.xml

diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
index f0e9170..7981ab3 100644
--- a/java/res/xml/key_styles_common.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -126,6 +126,13 @@
         latin:altCode="!code/key_space"
         latin:parentStyle="f1MoreKeysStyle" />
     <key-style
+        latin:styleName="settingsKeyStyle"
+        latin:code="!code/key_settings"
+        latin:keyIcon="!icon/settings_key"
+        latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
+        latin:altCode="!code/key_space"
+        latin:backgroundType="functional" />
+    <key-style
         latin:styleName="languageSwitchKeyStyle"
         latin:code="!code/key_language_switch"
         latin:keyIcon="!icon/language_switch_key"

java/res/xml/row_pcqwerty5.xml

diff --git a/java/res/xml/row_pcqwerty5.xml b/java/res/xml/row_pcqwerty5.xml
index c9ee32c..a8940af 100644
--- a/java/res/xml/row_pcqwerty5.xml
+++ b/java/res/xml/row_pcqwerty5.xml
@@ -48,6 +48,12 @@
                 <Key
                     latin:keyStyle="shortcutKeyStyle" />
             </case>
+            <case
+                latin:clobberSettingsKey="false"
+            >
+                <Key
+                    latin:keyStyle="settingsKeyStyle" />
+            </case>
         </switch>
         <switch>
             <case