aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/xml/key_styles_number.xml
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-02-06 11:34:12 +0900
committerTadashi G. Takaoka <takaoka@google.com>2014-02-07 18:47:22 +0900
commita83a1feb62c4b4ff1a7cf5b6f58ad115491de76f (patch)
tree916bc97d73c42e47b357c2a92e67ae2324c0b5d8 /java/res/xml/key_styles_number.xml
parentd6f147e14293d717e94ae30f1f33750adec6b9c5 (diff)
downloadlatinime-a83a1feb62c4b4ff1a7cf5b6f58ad115491de76f.tar.gz
latinime-a83a1feb62c4b4ff1a7cf5b6f58ad115491de76f.tar.xz
latinime-a83a1feb62c4b4ff1a7cf5b6f58ad115491de76f.zip
Consolidate keyIcon and code with keyLabel attribute
Change-Id: I75fbd348fab5022606ca14552eb03b15af6684c8
Diffstat (limited to 'java/res/xml/key_styles_number.xml')
-rw-r--r--java/res/xml/key_styles_number.xml26
1 files changed, 8 insertions, 18 deletions
diff --git a/java/res/xml/key_styles_number.xml b/java/res/xml/key_styles_number.xml
index 2e5a601b0..3c0cf720e 100644
--- a/java/res/xml/key_styles_number.xml
+++ b/java/res/xml/key_styles_number.xml
@@ -89,36 +89,28 @@
latin:keyLabel="9"
latin:keyHintLabel="WXYZ"
latin:parentStyle="numberKeyStyle" />
- <!-- U+002A: "*" ASTERISK
- U+FF0A: "*" FULLWIDTH ASTERISK -->
+ <!-- U+FF0A: "*" FULLWIDTH ASTERISK -->
<key-style
latin:styleName="numStarKeyStyle"
- latin:code="0x002A"
- latin:keyLabel="&#xFF0A;"
+ latin:keyLabel="&#xFF0A;|*"
latin:parentStyle="numKeyStyle" />
<!-- Only for non-tablet device -->
<key-style
latin:styleName="numPhoneToSymbolKeyStyle"
- latin:code="!code/key_switch_alpha_symbol"
- latin:keyLabel="!text/label_to_phone_symbols_key"
+ latin:keyLabel="!text/label_to_phone_symbols_key|!code/key_switch_alpha_symbol"
latin:parentStyle="numModeKeyStyle" />
<key-style
latin:styleName="numPhoneToNumericKeyStyle"
- latin:code="!code/key_switch_alpha_symbol"
- latin:keyLabel="!text/label_to_phone_numeric_key"
+ latin:keyLabel="!text/label_to_phone_numeric_key|!code/key_switch_alpha_symbol"
latin:parentStyle="numModeKeyStyle" />
- <!-- U+002C: "," COMMA -->
<key-style
latin:styleName="numPauseKeyStyle"
- latin:code="0x002C"
- latin:keyLabel="!text/label_pause_key"
+ latin:keyLabel="!text/label_pause_key|,"
latin:keyLabelFlags="followKeyHintLabelRatio|autoXScale"
latin:parentStyle="numKeyBaseStyle" />
- <!-- U+003B: ";" SEMICOLON -->
<key-style
latin:styleName="numWaitKeyStyle"
- latin:code="0x003B"
- latin:keyLabel="!text/label_wait_key"
+ latin:keyLabel="!text/label_wait_key|;"
latin:keyLabelFlags="followKeyHintLabelRatio|autoXScale"
latin:parentStyle="numKeyBaseStyle" />
<key-style
@@ -127,15 +119,13 @@
latin:parentStyle="tabKeyStyle" />
<key-style
latin:styleName="numSpaceKeyStyle"
- latin:code="!code/key_space"
- latin:keyIcon="!icon/space_key_for_number_layout"
+ latin:keyLabel="!icon/space_key_for_number_layout|!code/key_space"
latin:keyActionFlags="enableLongPress"
latin:parentStyle="numKeyBaseStyle" />
<!-- Override defaultEnterKeyStyle in key_styles_enter.xml -->
<key-style
latin:styleName="defaultEnterKeyStyle"
- latin:code="!code/key_enter"
- latin:keyIcon="!icon/enter_key"
+ latin:keyLabel="!icon/enter_key|!code/key_enter"
latin:keyLabelFlags="preserveCase|autoXScale|followKeyLargeLabelRatio"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional"