diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-04-07 20:07:12 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2011-04-08 10:27:51 +0900 |
| commit | cf4eff3f59a65acef7820bbfdd7eaac472460de8 (patch) | |
| tree | 57220c2e40e749f73de3f467dca7eb8313c759f7 /java | |
| parent | e7c0e73a19e6eb6cb9a4aded8a0a7240db544d85 (diff) | |
| download | latinime-cf4eff3f59a65acef7820bbfdd7eaac472460de8.tar.gz latinime-cf4eff3f59a65acef7820bbfdd7eaac472460de8.tar.xz latinime-cf4eff3f59a65acef7820bbfdd7eaac472460de8.zip | |
Remove "settings" key popup from "slash" and "atmark" key
Removing "settings" key popup from these keys when there's a dedicated
"settings" key in the layout.
This is followup chnage of I119528c0.
Bug: 4196879
Change-Id: I742cc6d1d890c095610f1e8b9ac91a044ec540b7
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml/kbd_qwerty_f1.xml | 75 |
1 files changed, 52 insertions, 23 deletions
diff --git a/java/res/xml/kbd_qwerty_f1.xml b/java/res/xml/kbd_qwerty_f1.xml index 008448b26..c93b8605a 100644 --- a/java/res/xml/kbd_qwerty_f1.xml +++ b/java/res/xml/kbd_qwerty_f1.xml @@ -23,44 +23,73 @@ > <switch> <case - latin:mode="url" + latin:hasSettingsKey="true" > - <Key - latin:keyLabel="/" - latin:keyHintIcon="@drawable/hint_popup" - latin:popupCharacters="@string/alternates_for_settings_slash" - latin:isFunctional="true" /> - </case> - <case - latin:mode="email" - > - <Key - latin:keyLabel="\@" - latin:keyHintIcon="@drawable/hint_popup" - latin:popupCharacters="@string/alternates_for_settings_at" - latin:isFunctional="true" /> - </case> - <default> <switch> <case - latin:hasVoiceKey="true" + latin:mode="url" > <Key - latin:keyStyle="micKeyStyle" /> + latin:keyLabel="/" + latin:isFunctional="true" /> </case> <case - latin:hasVoiceKey="false" + latin:mode="email" > + <Key + latin:keyLabel="\@" + latin:isFunctional="true" /> + </case> + <default> <switch> <case - latin:hasSettingsKey="true" + latin:hasVoiceKey="true" + > + <Key + latin:keyStyle="micKeyStyle" /> + </case> + <case + latin:hasVoiceKey="false" > <Key latin:keyLabel="," latin:isFunctional="true" /> </case> + </switch> + </default> + </switch> + </case> + <!-- latin:hasSettingsKey="false" --> + <default> + <switch> + <case + latin:mode="url" + > + <Key + latin:keyLabel="/" + latin:keyHintIcon="@drawable/hint_popup" + latin:popupCharacters="@string/alternates_for_settings_slash" + latin:isFunctional="true" /> + </case> + <case + latin:mode="email" + > + <Key + latin:keyLabel="\@" + latin:keyHintIcon="@drawable/hint_popup" + latin:popupCharacters="@string/alternates_for_settings_at" + latin:isFunctional="true" /> + </case> + <default> + <switch> + <case + latin:hasVoiceKey="true" + > + <Key + latin:keyStyle="micKeyStyle" /> + </case> <case - latin:hasSettingsKey="false" + latin:hasVoiceKey="false" > <Key latin:keyLabel="," @@ -69,7 +98,7 @@ latin:isFunctional="true" /> </case> </switch> - </case> + </default> </switch> </default> </switch> |