aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2011-07-31 18:43:28 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-31 18:43:28 -0700
commit6a07d7ddd974ef6c780fbc5835913c0afadb6aae (patch)
tree4d3ff6201549c5ddd953ee0075a1024bb1497c81 /java
parent83f6ca10d4778e987bd3520258164c33e4a3f652 (diff)
parente50733d196a0f42c20e1bcdf86a76827b12aacab (diff)
downloadlatinime-6a07d7ddd974ef6c780fbc5835913c0afadb6aae.tar.gz
latinime-6a07d7ddd974ef6c780fbc5835913c0afadb6aae.tar.xz
latinime-6a07d7ddd974ef6c780fbc5835913c0afadb6aae.zip
Merge "Rename popupSettingsStyle to f2PopupStyle"
Diffstat (limited to 'java')
-rw-r--r--java/res/xml-sw600dp/kbd_key_styles.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml
index f94309911..b679368a2 100644
--- a/java/res/xml-sw600dp/kbd_key_styles.xml
+++ b/java/res/xml-sw600dp/kbd_key_styles.xml
@@ -31,12 +31,12 @@
latin:clobberSettingsKey="true"
>
<key-style
- latin:styleName="settingsPopupStyle"
+ latin:styleName="f2PopupStyle"
latin:parentStyle="functionalKeyStyle" />
</case>
<default>
<key-style
- latin:styleName="settingsPopupStyle"
+ latin:styleName="f2PopupStyle"
latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="\@icon/5|\@integer/key_settings"
latin:parentStyle="functionalKeyStyle" />
@@ -79,7 +79,7 @@
latin:code="@integer/key_shortcut"
latin:keyIcon="iconShortcutKey"
latin:keyIconPreview="iconPreviewShortcutKey"
- latin:parentStyle="settingsPopupStyle" />
+ latin:parentStyle="f2PopupStyle" />
<key-style
latin:styleName="settingsKeyStyle"
latin:code="@integer/key_settings"