diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-04-26 01:41:38 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-04-26 01:41:38 -0700 |
| commit | 18f0d1938afaf8fd2d301454776c79ea7295270e (patch) | |
| tree | 42dd365edc3197fb2948661435de89c801c27df0 /java | |
| parent | 20a6dea1cabfd8822824f7dca828d898e5b91cbc (diff) | |
| parent | 41398ba26527b13d287f856389d3489ec892ee82 (diff) | |
| download | latinime-18f0d1938afaf8fd2d301454776c79ea7295270e.tar.gz latinime-18f0d1938afaf8fd2d301454776c79ea7295270e.tar.xz latinime-18f0d1938afaf8fd2d301454776c79ea7295270e.zip | |
Merge "Show settings key when noMicrophone option is enabled on PC QWERTY" into jb-dev
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml/key_styles_common.xml | 7 | ||||
| -rw-r--r-- | java/res/xml/row_pcqwerty5.xml | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index f0e9170e1..7981ab3a7 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" diff --git a/java/res/xml/row_pcqwerty5.xml b/java/res/xml/row_pcqwerty5.xml index c9ee32c04..a8940af6e 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 |