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

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

Merge "Show settings key when noMicrophone option is enabled on PC QWERTY" into jb-dev

parents 20a6dea1 41398ba2

java/res/xml/key_styles_common.xml

+7 −0
Original line number Original line Diff line number Diff line
@@ -125,6 +125,13 @@ 
        latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"

        latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"

        latin:altCode="!code/key_space"

        latin:altCode="!code/key_space"

        latin:parentStyle="f1MoreKeysStyle" />

        latin:parentStyle="f1MoreKeysStyle" />

    <key-style

        latin:styleName="settingsKeyStyle"

        latin:code="!code/key_settings"

        latin:keyIcon="!icon/settings_key"

        latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"

        latin:altCode="!code/key_space"

        latin:backgroundType="functional" />

    <key-style

    <key-style

        latin:styleName="languageSwitchKeyStyle"

        latin:styleName="languageSwitchKeyStyle"

        latin:code="!code/key_language_switch"

        latin:code="!code/key_language_switch"

java/res/xml/row_pcqwerty5.xml

+6 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,12 @@ 
                <Key

                <Key

                    latin:keyStyle="shortcutKeyStyle" />

                    latin:keyStyle="shortcutKeyStyle" />

            </case>

            </case>

            <case

                latin:clobberSettingsKey="false"

            >

                <Key

                    latin:keyStyle="settingsKeyStyle" />

            </case>

        </switch>

        </switch>

        <switch>

        <switch>

            <case

            <case