From 35e675b19652c758e02dd9d095e1dd8682f93d84 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Sun, 31 Jul 2011 19:19:32 -0700
Subject: [PATCH] Rename settingsPopupStyle to f1PopupStyle

Bug: 4340933
Change-Id: Ic026089123988940dca58a0aaac07f613ad45aff
---
 java/res/xml/kbd_key_styles.xml |  8 ++++----
 java/res/xml/kbd_qwerty_f1.xml  | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml
index 6667fa428..4d53cd12d 100644
--- a/java/res/xml/kbd_key_styles.xml
+++ b/java/res/xml/kbd_key_styles.xml
@@ -31,7 +31,7 @@
             latin:clobberSettingsKey="true"
         >
             <key-style
-                latin:styleName="settingsPopupStyle"
+                latin:styleName="f1PopupStyle"
                 latin:parentStyle="functionalKeyStyle" />
             <key-style
                 latin:styleName="symbolsF1PopupStyle"
@@ -42,7 +42,7 @@
             latin:hasSettingsKey="true"
         >
             <key-style
-                latin:styleName="settingsPopupStyle"
+                latin:styleName="f1PopupStyle"
                 latin:parentStyle="functionalKeyStyle" />
             <key-style
                 latin:styleName="symbolsF1PopupStyle"
@@ -51,7 +51,7 @@
         <!-- clobberSettingsKey="false" and hasSettingsKey="false" -->
         <default>
             <key-style
-                latin:styleName="settingsPopupStyle"
+                latin:styleName="f1PopupStyle"
                 latin:keyLabelOption="hasPopupHint"
                 latin:popupCharacters="\@icon/5|\@integer/key_settings"
                 latin:parentStyle="functionalKeyStyle" />
@@ -148,7 +148,7 @@
         latin:code="@integer/key_shortcut"
         latin:keyIcon="iconShortcutKey"
         latin:keyIconPreview="iconPreviewShortcutKey"
-        latin:parentStyle="settingsPopupStyle" />
+        latin:parentStyle="f1PopupStyle" />
     <key-style
         latin:styleName="settingsKeyStyle"
         latin:code="@integer/key_settings"
diff --git a/java/res/xml/kbd_qwerty_f1.xml b/java/res/xml/kbd_qwerty_f1.xml
index 45d0c17e8..337f981fd 100644
--- a/java/res/xml/kbd_qwerty_f1.xml
+++ b/java/res/xml/kbd_qwerty_f1.xml
@@ -32,7 +32,7 @@
                     <Key
                         latin:keyLabel="/"
                         latin:keyWidth="9.2%p"
-                        latin:keyStyle="settingsPopupStyle" />
+                        latin:keyStyle="f1PopupStyle" />
                 </case>
                 <case
                     latin:mode="email"
@@ -40,7 +40,7 @@
                     <Key
                         latin:keyLabel="\@"
                         latin:keyWidth="9.2%p"
-                        latin:keyStyle="settingsPopupStyle" />
+                        latin:keyStyle="f1PopupStyle" />
                 </case>
                 <default>
                     <switch>
@@ -58,13 +58,13 @@
                             <Key
                                 latin:keyLabel="."
                                 latin:keyWidth="9.2%p"
-                                latin:keyStyle="settingsPopupStyle" />
+                                latin:keyStyle="f1PopupStyle" />
                         </case>
                         <default>
                             <Key
                                 latin:keyLabel="@string/keylabel_for_comma"
                                 latin:keyWidth="9.2%p"
-                                latin:keyStyle="settingsPopupStyle" />
+                                latin:keyStyle="f1PopupStyle" />
                         </default>
                     </switch>
                 </default>
@@ -78,14 +78,14 @@
                 >
                     <Key
                         latin:keyLabel="/"
-                        latin:keyStyle="settingsPopupStyle" />
+                        latin:keyStyle="f1PopupStyle" />
                 </case>
                 <case
                     latin:mode="email"
                 >
                     <Key
                         latin:keyLabel="\@"
-                        latin:keyStyle="settingsPopupStyle" />
+                        latin:keyStyle="f1PopupStyle" />
                 </case>
                 <default>
                     <switch>
@@ -101,12 +101,12 @@
                         >
                             <Key
                                 latin:keyLabel="."
-                                latin:keyStyle="settingsPopupStyle" />
+                                latin:keyStyle="f1PopupStyle" />
                         </case>
                         <default>
                             <Key
                                 latin:keyLabel="@string/keylabel_for_comma"
-                                latin:keyStyle="settingsPopupStyle" />
+                                latin:keyStyle="f1PopupStyle" />
                         </default>
                     </switch>
                 </default>