aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/xml-sw600dp/key_styles_common.xml
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-02-05 18:26:14 +0900
committerTadashi G. Takaoka <takaoka@google.com>2014-02-06 16:42:57 +0900
commitd6f147e14293d717e94ae30f1f33750adec6b9c5 (patch)
tree5ea54b24b97c645c05ee75f4eadf334ea9b1f271 /java/res/xml-sw600dp/key_styles_common.xml
parent6193217f5c850bcfa393e18bbf3dc6e34f4cc220 (diff)
downloadlatinime-d6f147e14293d717e94ae30f1f33750adec6b9c5.tar.gz
latinime-d6f147e14293d717e94ae30f1f33750adec6b9c5.tar.xz
latinime-d6f147e14293d717e94ae30f1f33750adec6b9c5.zip
Consolidate keyOutputText with keyLabel attribute
Change-Id: I90ea2c9d5ce42fabc79599995a2fae1f5f652a6b
Diffstat (limited to 'java/res/xml-sw600dp/key_styles_common.xml')
-rw-r--r--java/res/xml-sw600dp/key_styles_common.xml9
1 files changed, 1 insertions, 8 deletions
diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml
index d817add11..4e4579b4f 100644
--- a/java/res/xml-sw600dp/key_styles_common.xml
+++ b/java/res/xml-sw600dp/key_styles_common.xml
@@ -101,12 +101,6 @@
latin:keyLabelFlags="hasPopupHint"
latin:keyActionFlags="noKeyPreview" />
<key-style
- latin:styleName="smileyKeyStyle"
- latin:keyLabel=":-)"
- latin:keyOutputText=":-) "
- latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/more_keys_for_smiley" />
- <key-style
latin:styleName="shortcutKeyStyle"
latin:code="!code/key_shortcut"
latin:keyIcon="!icon/shortcut_key"
@@ -190,8 +184,7 @@
latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style
latin:styleName="comKeyStyle"
- latin:keyLabel="!text/keylabel_for_popular_domain"
+ latin:keyLabel="!text/keylabel_for_popular_domain|!text/keylabel_for_popular_domain"
latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase"
- latin:keyOutputText="!text/keylabel_for_popular_domain"
latin:moreKeys="!text/more_keys_for_popular_domain" />
</merge>