nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Fix settings keys on tablet"

main
Tadashi G. Takaoka 2014-11-28 02:56:00 +00:00 committed by Android (Google) Code Review
parent b0a0ce0b31 64885b263e
commit 71f82c375c
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/res/xml-sw600dp/key_styles_common.xml
View File

@ -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 -->

3
java/res/xml/key_styles_common.xml
View File

@ -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 -->

9
java/res/xml/key_styles_settings.xml
View File

@ -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>