diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-02-05 18:26:14 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2014-02-06 16:42:57 +0900 |
| commit | d6f147e14293d717e94ae30f1f33750adec6b9c5 (patch) | |
| tree | 5ea54b24b97c645c05ee75f4eadf334ea9b1f271 /java/res | |
| parent | 6193217f5c850bcfa393e18bbf3dc6e34f4cc220 (diff) | |
| download | latinime-d6f147e14293d717e94ae30f1f33750adec6b9c5.tar.gz latinime-d6f147e14293d717e94ae30f1f33750adec6b9c5.tar.xz latinime-d6f147e14293d717e94ae30f1f33750adec6b9c5.zip | |
Consolidate keyOutputText with keyLabel attribute
Change-Id: I90ea2c9d5ce42fabc79599995a2fae1f5f652a6b
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 | 9 | ||||
| -rw-r--r-- | java/res/xml/key_styles_common.xml | 3 |
3 files changed, 2 insertions, 13 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 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> 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> |