1 files changed, 11 insertions, 15 deletions
diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml
index dfc7409ad..d86a01dc1 100644
--- a/java/res/xml-sw600dp/kbd_key_styles.xml
+++ b/java/res/xml-sw600dp/kbd_key_styles.xml
@@ -21,10 +21,6 @@
 <merge
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
-    <!-- Base key style for the functional key -->
-    <key-style
-        latin:styleName="functionalKeyStyle"
-        latin:backgroundType="functional" />
     <!-- Base key style for the key which may have settings key as popup key -->
     <switch>
         <case
@@ -32,14 +28,14 @@
         >
             <key-style
                 latin:styleName="f2PopupStyle"
-                latin:parentStyle="functionalKeyStyle" />
+                latin:backgroundType="functional" />
         </case>
         <default>
             <key-style
                 latin:styleName="f2PopupStyle"
                 latin:keyLabelOption="hasPopupHint"
                 latin:moreKeys="\@icon/3|\@integer/key_settings"
-                latin:parentStyle="functionalKeyStyle" />
+                latin:backgroundType="functional" />
         </default>
     </switch>
     <!-- Functional key styles -->
@@ -48,19 +44,19 @@
         latin:code="@integer/key_shift"
         latin:keyIcon="iconShiftKey"
         latin:keyIconShifted="iconShiftedShiftKey"
-        latin:parentStyle="functionalKeyStyle"
+        latin:backgroundType="functional"
         latin:isSticky="true" />
     <key-style
         latin:styleName="deleteKeyStyle"
         latin:code="@integer/key_delete"
         latin:keyIcon="iconDeleteKey"
-        latin:parentStyle="functionalKeyStyle"
+        latin:backgroundType="functional"
         latin:isRepeatable="true" />
     <key-style
         latin:styleName="returnKeyStyle"
         latin:code="@integer/key_return"
         latin:keyIcon="iconReturnKey"
-        latin:parentStyle="functionalKeyStyle" />
+        latin:backgroundType="functional" />
     <key-style
         latin:styleName="spaceKeyStyle"
         latin:code="@integer/key_space" />
@@ -85,33 +81,33 @@
         latin:code="@integer/key_settings"
         latin:keyIcon="iconSettingsKey"
         latin:keyIconPreview="iconPreviewSettingsKey"
-        latin:parentStyle="functionalKeyStyle" />
+        latin:backgroundType="functional" />
     <key-style
         latin:styleName="tabKeyStyle"
         latin:code="@integer/key_tab"
         latin:keyIcon="iconTabKey"
         latin:keyIconPreview="iconPreviewTabKey"
-        latin:parentStyle="functionalKeyStyle" />
+        latin:backgroundType="functional" />
     <key-style
         latin:styleName="toSymbolKeyStyle"
         latin:code="@integer/key_switch_alpha_symbol"
         latin:keyLabel="@string/label_to_symbol_key"
-        latin:parentStyle="functionalKeyStyle" />
+        latin:backgroundType="functional" />
     <key-style
         latin:styleName="toAlphaKeyStyle"
         latin:code="@integer/key_switch_alpha_symbol"
         latin:keyLabel="@string/label_to_alpha_key"
-        latin:parentStyle="functionalKeyStyle" />
+        latin:backgroundType="functional" />
     <key-style
         latin:styleName="toMoreSymbolKeyStyle"
         latin:code="@integer/key_shift"
         latin:keyLabel="@string/label_to_more_symbol_for_tablet_key"
-        latin:parentStyle="functionalKeyStyle" />
+        latin:backgroundType="functional" />
     <key-style
         latin:styleName="backFromMoreSymbolKeyStyle"
         latin:code="@integer/key_shift"
         latin:keyLabel="@string/label_to_symbol_key"
-        latin:parentStyle="functionalKeyStyle" />
+        latin:backgroundType="functional" />
     <key-style
         latin:styleName="comKeyStyle"
         latin:keyLabel="@string/keylabel_for_popular_domain"