diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-02-06 01:37:50 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-02-06 01:37:50 -0800 |
| commit | 32ca47a547df5a45bf1f481f998cb61c8219ea59 (patch) | |
| tree | 8876e41612d63face12bd141e3e783777f58792c /java/res/xml-sw600dp | |
| parent | 5e6a8dd6d9e697d0adf9534c9dc081cebd0ff71f (diff) | |
| parent | 48ea52800ac490b0c32c91b9982c7e01a455ffe5 (diff) | |
| download | latinime-32ca47a547df5a45bf1f481f998cb61c8219ea59.tar.gz latinime-32ca47a547df5a45bf1f481f998cb61c8219ea59.tar.xz latinime-32ca47a547df5a45bf1f481f998cb61c8219ea59.zip | |
am 48ea5280: Merge "Consolidate keyOutputText with keyLabel attribute"
* commit '48ea52800ac490b0c32c91b9982c7e01a455ffe5':
Consolidate keyOutputText with keyLabel attribute
Diffstat (limited to 'java/res/xml-sw600dp')
| -rw-r--r-- | java/res/xml-sw600dp/key_styles_common.xml | 3 |
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> |