Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71f82c37 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Fix settings keys on tablet"

parents b0a0ce0b 64885b26

java/res/xml-sw600dp/key_styles_common.xml

+0 −4
Original line number Diff line number Diff line
@@ -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 -->

java/res/xml/key_styles_common.xml

+0 −3
Original line number Diff line number Diff line
@@ -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 -->

java/res/xml/key_styles_settings.xml

+3 −6
Original line number Diff line number Diff line
@@ -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>