aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/xml-sw600dp
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-02-06 09:14:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-02-06 09:14:09 +0000
commit48ea52800ac490b0c32c91b9982c7e01a455ffe5 (patch)
treea9b43f2bf80b5a652635505179ad580935f3ef27 /java/res/xml-sw600dp
parentd645db1e37a376e71d56834033b82a07e6f387b8 (diff)
parentd6f147e14293d717e94ae30f1f33750adec6b9c5 (diff)
downloadlatinime-48ea52800ac490b0c32c91b9982c7e01a455ffe5.tar.gz
latinime-48ea52800ac490b0c32c91b9982c7e01a455ffe5.tar.xz
latinime-48ea52800ac490b0c32c91b9982c7e01a455ffe5.zip
Merge "Consolidate keyOutputText with keyLabel attribute"
Diffstat (limited to 'java/res/xml-sw600dp')
-rw-r--r--java/res/xml-sw600dp/key_styles_common.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml
index 245b43358..4e4579b4f 100644
--- a/java/res/xml-sw600dp/key_styles_common.xml
+++ b/java/res/xml-sw600dp/key_styles_common.xml
@@ -184,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>