diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-01-20 03:29:02 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-01-20 03:29:02 -0800 |
| commit | d5937e08e5fce7c283d264dc9a7a245b3d0c756d (patch) | |
| tree | ed6ca8aa0bb2810c612c8c462aad951d463adc7b /java/res | |
| parent | e81b375a34ccfae000a25c56517004bb290a0996 (diff) | |
| parent | 530f5d7e155011ff4fa520002c68acb78b195497 (diff) | |
| download | latinime-d5937e08e5fce7c283d264dc9a7a245b3d0c756d.tar.gz latinime-d5937e08e5fce7c283d264dc9a7a245b3d0c756d.tar.xz latinime-d5937e08e5fce7c283d264dc9a7a245b3d0c756d.zip | |
am 530f5d7e: Merge "Support @icon/icon_name for more keys specification"
* commit '530f5d7e155011ff4fa520002c68acb78b195497':
Support @icon/icon_name for more keys specification
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> |