diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-12-10 19:46:23 -0800 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2012-12-13 17:44:40 +0900 |
| commit | 8eaf75aa7bfa471e17626b1741f63475353bf36b (patch) | |
| tree | b2d37487ddd31f11b35451ce8e583dc79bbc2645 /java/res/xml/key_styles_common.xml | |
| parent | ac3720ce6d5d9a0084c9275d0e0f3e846c5b27c6 (diff) | |
| download | latinime-8eaf75aa7bfa471e17626b1741f63475353bf36b.tar.gz latinime-8eaf75aa7bfa471e17626b1741f63475353bf36b.tar.xz latinime-8eaf75aa7bfa471e17626b1741f63475353bf36b.zip | |
Fix label of switch to symbols key when symbols has shortcut key
This change fixes the labels of switch to symbols key and switch back
from more symbols key when symbols layout has shortcut key.
Change-Id: I3fbbef2d929486d0f0542f4d89cb086d9f5bad82
Diffstat (limited to 'java/res/xml/key_styles_common.xml')
| -rw-r--r-- | java/res/xml/key_styles_common.xml | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index 162119dab..91ebac1da 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -134,52 +134,50 @@ latin:code="!code/key_tab" latin:keyIcon="!icon/tab_key" latin:keyIconPreview="!icon/tab_key_preview" /> + <key-style + latin:styleName="baseForLayoutSwitchKeyStyle" + latin:keyLabelFlags="preserveCase" + latin:keyActionFlags="noKeyPreview" + latin:backgroundType="functional" /> <switch> <!-- When this qwerty keyboard has no shortcut keys but shortcut key is enabled, then symbol keyboard will have a shortcut key. That means we should use label_to_symbol_key label and shortcut_for_label icon. --> <case - latin:shortcutKeyEnabled="true" - latin:hasShortcutKey="false" + latin:shortcutKeyOnSymbols="true" > <key-style - latin:styleName="toSymbolKeyStyle" - latin:code="!code/key_switch_alpha_symbol" + latin:styleName="baseForToSymbolKeyStyle" latin:keyIcon="!icon/shortcut_for_label" latin:keyLabel="!text/label_to_symbol_with_microphone_key" latin:keyLabelFlags="withIconRight|preserveCase" - latin:keyActionFlags="noKeyPreview" - latin:backgroundType="functional" /> + latin:parentStyle="baseForLayoutSwitchKeyStyle" /> </case> <default> <key-style - latin:styleName="toSymbolKeyStyle" - latin:code="!code/key_switch_alpha_symbol" + latin:styleName="baseForToSymbolKeyStyle" latin:keyLabel="!text/label_to_symbol_key" - latin:keyLabelFlags="preserveCase" - latin:keyActionFlags="noKeyPreview" - latin:backgroundType="functional" /> + latin:parentStyle="baseForLayoutSwitchKeyStyle" /> </default> </switch> <key-style + latin:styleName="toSymbolKeyStyle" + latin:code="!code/key_switch_alpha_symbol" + latin:parentStyle="baseForToSymbolKeyStyle" /> + <key-style latin:styleName="toAlphaKeyStyle" latin:code="!code/key_switch_alpha_symbol" latin:keyLabel="!text/label_to_alpha_key" - latin:keyLabelFlags="preserveCase" - latin:keyActionFlags="noKeyPreview" - latin:backgroundType="functional" /> + latin:parentStyle="baseForLayoutSwitchKeyStyle" /> <key-style latin:styleName="toMoreSymbolKeyStyle" latin:code="!code/key_shift" latin:keyLabel="!text/label_to_more_symbol_key" - latin:keyActionFlags="noKeyPreview" - latin:backgroundType="functional" /> + latin:parentStyle="baseForLayoutSwitchKeyStyle" /> <key-style latin:styleName="backFromMoreSymbolKeyStyle" latin:code="!code/key_shift" - latin:keyLabel="!text/label_to_symbol_key" - latin:keyActionFlags="noKeyPreview" - latin:backgroundType="functional" /> + latin:parentStyle="baseForToSymbolKeyStyle" /> <key-style latin:styleName="punctuationKeyStyle" latin:keyLabel="." |