commit 7f0c503afc9a130da73503e97108d2ca5ae328ad
author Tadashi G. Takaoka <takaoka@google.com> Mon Apr 09 20:32:32 2012 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Tue Apr 10 12:01:07 2012 +0900
tree 5b21e70cec17d1352da5f42e3af0a89c01e70184
parent ed3bac91f242850c6d1833a5f8981b9cc208c5dd

Use !icon/<icon_name> notation for more keys spec

Change-Id: I616e6c1ac603d2eb7a5c99ec70d5411371d15f3e

java/res/values/attrs.xml

diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index d574b9e..573ec68 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" />

java/res/values/donottranslate-more-keys.xml

diff --git a/java/res/values/donottranslate-more-keys.xml b/java/res/values/donottranslate-more-keys.xml
index 5e97edc..14c278a 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">&#x207F;,&#x2205;</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>