diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-02-06 09:14:08 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-02-06 09:14:09 +0000 |
| commit | 48ea52800ac490b0c32c91b9982c7e01a455ffe5 (patch) | |
| tree | a9b43f2bf80b5a652635505179ad580935f3ef27 /java/res | |
| parent | d645db1e37a376e71d56834033b82a07e6f387b8 (diff) | |
| parent | d6f147e14293d717e94ae30f1f33750adec6b9c5 (diff) | |
| download | latinime-48ea52800ac490b0c32c91b9982c7e01a455ffe5.tar.gz latinime-48ea52800ac490b0c32c91b9982c7e01a455ffe5.tar.xz latinime-48ea52800ac490b0c32c91b9982c7e01a455ffe5.zip | |
Merge "Consolidate keyOutputText with keyLabel attribute"
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/attrs.xml | 3 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/key_styles_common.xml | 3 | ||||
| -rw-r--r-- | java/res/xml/key_styles_common.xml | 3 |
3 files changed, 2 insertions, 7 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 413987880..5bedd4ac2 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -276,9 +276,6 @@ <flag name="altCodeWhileTyping" value="0x04" /> <flag name="enableLongPress" value="0x08" /> </attr> - <!-- TODO: Remove keyOutputText attribute and consolidate with keySpec. --> - <!-- The string of characters to output when this key is pressed. --> - <attr name="keyOutputText" format="string" /> <!-- TODO: Rename keyLabel to keySpec. --> <!-- The label to display on the key. --> <attr name="keyLabel" format="string" /> 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> diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index d538eb8c3..9c40d627a 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -184,9 +184,8 @@ latin:parentStyle="baseForToSymbolKeyStyle" /> <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" latin:backgroundType="functional" /> </merge> |