From 64885b263ece2817674b5cbcaa8170353298cf3e Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Thu, 27 Nov 2014 16:08:53 +0900
Subject: [PATCH] Fix settings keys on tablet
Bug: 18531491
Change-Id: Id374932b71674177abddd6d249ba6e712cbb5d25
---
java/res/xml-sw600dp/key_styles_common.xml | 4 ----
java/res/xml/key_styles_common.xml | 3 ---
java/res/xml/key_styles_settings.xml | 9 +++------
3 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml
index 006cda3708..ea8f292503 100644
--- a/java/res/xml-sw600dp/key_styles_common.xml
+++ b/java/res/xml-sw600dp/key_styles_common.xml
@@ -35,10 +35,6 @@
latin:keyLabelFlags="hasShiftedLetterHint" />
</default>
</switch>
- <!-- Base key style for the key which may have settings key as more keys. -->
- <key-style
- latin:styleName="baseSettingsMoreKeysStyle"
- latin:parentStyle="hasShiftedLetterHintStyle" />
<include
latin:keyboardLayout="@xml/key_styles_settings" />
<!-- Functional key styles -->
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
index b36ddf2364..d85438d996 100644
--- a/java/res/xml/key_styles_common.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -35,9 +35,6 @@
latin:keyLabelFlags="hasShiftedLetterHint" />
</default>
</switch>
- <!-- Base key style for the key which may have settings key as more keys. -->
- <key-style
- latin:styleName="baseSettingsMoreKeysStyle" />
<include
latin:keyboardLayout="@xml/key_styles_settings" />
<!-- Functional key styles -->
diff --git a/java/res/xml/key_styles_settings.xml b/java/res/xml/key_styles_settings.xml
index a504bed78a..43ee601e6f 100644
--- a/java/res/xml/key_styles_settings.xml
+++ b/java/res/xml/key_styles_settings.xml
@@ -21,16 +21,14 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <!-- Base key style for the key which may have settings key as more keys. -->
- <!-- Kept as a separate file for cleaner overriding by an overlay. -->
+ <!-- Key style for the key which may have settings key as more keys. -->
<switch>
<case
latin:clobberSettingsKey="true"
>
<key-style
latin:styleName="settingsMoreKeysStyle"
- latin:backgroundType="functional"
- latin:parentStyle="baseSettingsMoreKeysStyle" />
+ latin:backgroundType="functional" />
</case>
<!-- clobberSettingsKey="false" -->
<default>
@@ -38,8 +36,7 @@
latin:styleName="settingsMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
latin:additionalMoreKeys="!text/keyspec_settings"
- latin:backgroundType="functional"
- latin:parentStyle="baseSettingsMoreKeysStyle" />
+ latin:backgroundType="functional" />
</default>
</switch>
</merge>
--
GitLab