diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-01-20 19:57:07 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2012-01-20 20:09:02 +0900 |
| commit | b009a24b838b560bd093ff295c99c0cf5fe27c81 (patch) | |
| tree | f9a2dab409515a0494fbda7a9385ba91a9d5f6ba /java/res | |
| parent | 54c2dd67b0564420ca9892bbb60ba917fcbf6752 (diff) | |
| download | latinime-b009a24b838b560bd093ff295c99c0cf5fe27c81.tar.gz latinime-b009a24b838b560bd093ff295c99c0cf5fe27c81.tar.xz latinime-b009a24b838b560bd093ff295c99c0cf5fe27c81.zip | |
Support @icon/icon_name for more keys specification
Change-Id: I8842e5ce77f9d27a0969df947de292c1830e36b7
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values-ar/donottranslate-more-keys.xml | 6 | ||||
| -rw-r--r-- | java/res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | java/res/values/donottranslate-more-keys.xml | 6 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/kbd_key_styles.xml | 2 |
4 files changed, 5 insertions, 11 deletions
diff --git a/java/res/values-ar/donottranslate-more-keys.xml b/java/res/values-ar/donottranslate-more-keys.xml index cde686084..e49677adb 100644 --- a/java/res/values-ar/donottranslate-more-keys.xml +++ b/java/res/values-ar/donottranslate-more-keys.xml @@ -70,10 +70,8 @@ <string name="keylabel_for_symbols_percent">\u066a</string> <string name="more_keys_for_comma">,</string> <string name="more_keys_for_f1">,</string> - <!-- @icon/3 is iconSettingsKey --> - <string name="more_keys_for_f1_settings">\\,,\@icon/3|\@integer/key_settings</string> - <!-- @icon/7 is iconTabKey --> - <string name="more_keys_for_f1_navigate">\\,,\@icon/7|\@integer/key_tab</string> + <string name="more_keys_for_f1_settings">\\,,\@icon/settingsKey|\@integer/key_settings</string> + <string name="more_keys_for_f1_navigate">\\,,\@icon/tabKey|\@integer/key_tab</string> <string name="more_keys_for_symbols_question">\?</string> <string name="more_keys_for_symbols_semicolon">;</string> <string name="more_keys_for_symbols_percent">%,‰</string> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 9892d7835..57930c675 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -248,12 +248,10 @@ <!-- This should be aligned with the KeyboardIcons.ICONS_TO_ATTRS_MAP --> <enum name="iconShiftKey" value="1" /> <enum name="iconDeleteKey" value="2" /> - <!-- This is also represented as "@icon/3" in keyboard layout XML. --> <enum name="iconSettingsKey" value="3" /> <enum name="iconSpaceKey" value="4" /> <enum name="iconReturnKey" value="5" /> <enum name="iconSearchKey" value="6" /> - <!-- This is also represented as "@icon/7" in keyboard layout XML. --> <enum name="iconTabKey" value="7" /> <enum name="iconShortcutKey" value="8" /> <enum name="iconShortcutForLabel" value="9" /> diff --git a/java/res/values/donottranslate-more-keys.xml b/java/res/values/donottranslate-more-keys.xml index 3a3ea1e55..ce1538131 100644 --- a/java/res/values/donottranslate-more-keys.xml +++ b/java/res/values/donottranslate-more-keys.xml @@ -91,10 +91,8 @@ <string name="keylabel_for_symbols_percent">%</string> <string name="more_keys_for_comma"></string> <string name="more_keys_for_f1"></string> - <!-- @icon/3 is iconSettingsKey --> - <string name="more_keys_for_f1_settings">\@icon/3|\@integer/key_settings</string> - <!-- @icon/7 is iconTabKey --> - <string name="more_keys_for_f1_navigate">\@icon/7|\@integer/key_tab</string> + <string name="more_keys_for_f1_settings">\@icon/settingsKey|\@integer/key_settings</string> + <string name="more_keys_for_f1_navigate">\@icon/tabKey|\@integer/key_tab</string> <string name="more_keys_for_symbols_question">¿</string> <string name="more_keys_for_symbols_semicolon"></string> <string name="more_keys_for_symbols_percent">‰</string> diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml index ab90c9894..abba592b7 100644 --- a/java/res/xml-sw600dp/kbd_key_styles.xml +++ b/java/res/xml-sw600dp/kbd_key_styles.xml @@ -34,7 +34,7 @@ <key-style latin:styleName="f2PopupStyle" latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="\@icon/3|\@integer/key_settings" + latin:moreKeys="\@icon/settingsKey|\@integer/key_settings" latin:backgroundType="functional" /> </default> </switch> |