am 18f0d193: Merge "Show settings key when noMicrophone option is enabled on PC QWERTY" into jb-dev

* commit '18f0d1938afaf8fd2d301454776c79ea7295270e':
  Show settings key when noMicrophone option is enabled on PC QWERTY
main
Tadashi G. Takaoka 2012-04-26 01:46:34 -07:00 committed by Android Git Automerger
commit 9db12f04bf
2 changed files with 13 additions and 0 deletions

View File

@ -125,6 +125,13 @@
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
latin:altCode="!code/key_space" latin:altCode="!code/key_space"
latin:parentStyle="f1MoreKeysStyle" /> 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 <key-style
latin:styleName="languageSwitchKeyStyle" latin:styleName="languageSwitchKeyStyle"
latin:code="!code/key_language_switch" latin:code="!code/key_language_switch"

View File

@ -48,6 +48,12 @@
<Key <Key
latin:keyStyle="shortcutKeyStyle" /> latin:keyStyle="shortcutKeyStyle" />
</case> </case>
<case
latin:clobberSettingsKey="false"
>
<Key
latin:keyStyle="settingsKeyStyle" />
</case>
</switch> </switch>
<switch> <switch>
<case <case