diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-11-28 02:56:00 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-11-28 02:56:01 +0000 |
| commit | 71f82c375cef69cb9044805b0ad87c394dc25ca2 (patch) | |
| tree | 1e242f17f56747251273558775078ee7ccefe9a5 /java | |
| parent | b0a0ce0b31c552270a21f2952b2d804b119e22e9 (diff) | |
| parent | 64885b263ece2817674b5cbcaa8170353298cf3e (diff) | |
| download | latinime-71f82c375cef69cb9044805b0ad87c394dc25ca2.tar.gz latinime-71f82c375cef69cb9044805b0ad87c394dc25ca2.tar.xz latinime-71f82c375cef69cb9044805b0ad87c394dc25ca2.zip | |
Merge "Fix settings keys on tablet"
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml-sw600dp/key_styles_common.xml | 4 | ||||
| -rw-r--r-- | java/res/xml/key_styles_common.xml | 3 | ||||
| -rw-r--r-- | 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 006cda370..ea8f29250 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 b36ddf236..d85438d99 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 a504bed78..43ee601e6 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> |