diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-04-09 20:32:32 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2012-04-10 12:01:07 +0900 |
| commit | 7f0c503afc9a130da73503e97108d2ca5ae328ad (patch) | |
| tree | 5b21e70cec17d1352da5f42e3af0a89c01e70184 /java/res | |
| parent | ed3bac91f242850c6d1833a5f8981b9cc208c5dd (diff) | |
| download | latinime-7f0c503afc9a130da73503e97108d2ca5ae328ad.tar.gz latinime-7f0c503afc9a130da73503e97108d2ca5ae328ad.tar.xz latinime-7f0c503afc9a130da73503e97108d2ca5ae328ad.zip | |
Use !icon/<icon_name> notation for more keys spec
Change-Id: I616e6c1ac603d2eb7a5c99ec70d5411371d15f3e
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/attrs.xml | 3 | ||||
| -rw-r--r-- | java/res/values/donottranslate-more-keys.xml | 2 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/key_styles_common.xml | 2 | ||||
| -rw-r--r-- | java/res/xml-sw768dp/key_styles_common.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/key_styles_common.xml | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index d574b9edb..573ec68b7 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -300,6 +300,7 @@ <flag name="disableAdditionalMoreKeys" value="0x80000000" /> </attr> <!-- The icon to display on the key instead of the label. --> + <!-- TODO: Use string format !icon/name. --> <attr name="keyIcon" format="enum"> <!-- This should be aligned with the KeyboardIconsSet.ICON_* --> <enum name="iconUndefined" value="0" /> @@ -319,11 +320,13 @@ <enum name="iconZwjKey" value="16" /> </attr> <!-- The icon for disabled key --> + <!-- TODO: Use string format !icon/name. --> <attr name="keyIconDisabled" format="enum"> <!-- This should be aligned with the KeyboardIconsSet.ICON_* --> <enum name="iconDisabledShortcutKey" value="12" /> </attr> <!-- The icon to show in the popup preview. --> + <!-- TODO: Use string format !icon/name. --> <attr name="keyIconPreview" format="enum"> <!-- This should be aligned with the KeyboardIconsSet.ICON_* --> <enum name="iconPreviewTabKey" value="13" /> diff --git a/java/res/values/donottranslate-more-keys.xml b/java/res/values/donottranslate-more-keys.xml index 5e97edc1e..14c278af9 100644 --- a/java/res/values/donottranslate-more-keys.xml +++ b/java/res/values/donottranslate-more-keys.xml @@ -120,7 +120,7 @@ U+2205: "∅" EMPTY SET --> <string name="more_keys_for_symbols_0">ⁿ,∅</string> <string name="more_keys_for_am_pm">!fixedColumnOrder!2,!hasLabels!,\@string/label_time_am,\@string/label_time_pm</string> - <string name="settings_as_more_key">\@icon/settingsKey|!code/key_settings</string> + <string name="settings_as_more_key">!icon/settingsKey|!code/key_settings</string> <string name="keylabel_for_comma">,</string> <string name="more_keys_for_comma"></string> <string name="action_next_as_more_key">!hasLabels!,\@string/label_next_key|!code/key_action_next</string> diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml index 3cec9aab7..b0f610912 100644 --- a/java/res/xml-sw600dp/key_styles_common.xml +++ b/java/res/xml-sw600dp/key_styles_common.xml @@ -84,7 +84,7 @@ latin:styleName="zwnjKeyStyle" latin:code="0x200C" latin:keyIcon="iconZwnjKey" - latin:moreKeys="\@icon/zwjKey|‍" + latin:moreKeys="!icon/zwjKey|‍" latin:keyLabelFlags="hasPopupHint" latin:keyActionFlags="noKeyPreview" /> <key-style diff --git a/java/res/xml-sw768dp/key_styles_common.xml b/java/res/xml-sw768dp/key_styles_common.xml index c3ad195bc..aa9cd692a 100644 --- a/java/res/xml-sw768dp/key_styles_common.xml +++ b/java/res/xml-sw768dp/key_styles_common.xml @@ -83,7 +83,7 @@ latin:styleName="zwnjKeyStyle" latin:code="0x200C" latin:keyIcon="iconZwnjKey" - latin:moreKeys="\@icon/zwjKey|‍" + latin:moreKeys="!icon/zwjKey|‍" latin:keyLabelFlags="hasPopupHint" latin:keyActionFlags="noKeyPreview" /> <key-style diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index bd002fdac..b0b87a810 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -113,7 +113,7 @@ latin:styleName="zwnjKeyStyle" latin:code="0x200C" latin:keyIcon="iconZwnjKey" - latin:moreKeys="\@icon/zwjKey|‍" + latin:moreKeys="!icon/zwjKey|‍" latin:keyLabelFlags="hasPopupHint" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> |