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

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

Merge "Fix "Show settings key" option on 7" device"

parents da9b1325 cd96a691

java/res/values/attrs.xml

+8 −0
Original line number Diff line number Diff line
@@ -277,6 +277,14 @@ 
        <attr name="navigateAction" format="boolean" />

        <attr name="passwordInput" format="boolean" />

        <attr name="hasSettingsKey" format="boolean" />

        <!-- This should be aligned with KeyboardID.F2KEY_MODE_* -->

        <attr name="f2KeyMode" format="enum">

            <enum name="none" value="0" />

            <enum name="settings" value="1" />

            <enum name="shortcutIme" value="2" />

            <enum name="shortcutImeOrSettings" value="3" />

        </attr>

        <attr name="clobberSettingsKey" format="boolean" />

        <attr name="voiceKeyEnabled" format="boolean" />

        <attr name="hasVoiceKey" format="boolean" />

        <attr name="imeAction" format="enum">

java/res/xml-sw600dp/kbd_key_styles.xml

+29 −22
Original line number Diff line number Diff line
@@ -25,6 +25,23 @@ 
    <key-style

        latin:styleName="functionalKeyStyle"

        latin:isFunctional="true" />

    <!-- Base key style for the key which may have settings key as popup key -->

    <switch>

        <case

            latin:clobberSettingsKey="true"

        >

            <key-style

                latin:styleName="settingsPopupStyle"

                latin:parentStyle="functionalKeyStyle" />

        </case>

        <default>

            <key-style

                latin:styleName="settingsPopupStyle"

                latin:keyLabelOption="popupHint"

                latin:popupCharacters="\@icon/5|\@integer/key_settings"

                latin:parentStyle="functionalKeyStyle" />

        </default>

    </switch>

    <!-- Functional key styles -->

    <key-style

        latin:styleName="shiftKeyStyle"
@@ -59,28 +76,18 @@ 
        latin:keyLabelOption="popupHint"

        latin:popupCharacters="@string/alternates_for_smiley"

        latin:maxPopupKeyboardColumn="5" />

    <switch>

        <case

            latin:voiceKeyEnabled="true"

        >

    <key-style

                latin:styleName="shortcutOrSettingsKeyStyle"

        latin:styleName="shortcutKeyStyle"

        latin:code="@integer/key_shortcut"

        latin:keyIcon="iconShortcutKey"

        latin:keyIconPreview="iconPreviewShortcutKey"

                latin:keyLabelOption="popupHint"

                latin:popupCharacters="\@icon/5|\@integer/key_settings"

                latin:parentStyle="functionalKeyStyle" />

        </case>

        <default>

        latin:parentStyle="settingsPopupStyle" />

    <key-style

                latin:styleName="shortcutOrSettingsKeyStyle"

        latin:styleName="settingsKeyStyle"

        latin:code="@integer/key_settings"

        latin:keyIcon="iconSettingsKey"

        latin:keyIconPreview="iconPreviewSettingsKey"

        latin:parentStyle="functionalKeyStyle" />

        </default>

    </switch>

    <key-style

        latin:styleName="tabKeyStyle"

        latin:code="@integer/key_tab"

java/res/xml-sw600dp/kbd_number.xml

+8 −9
Original line number Diff line number Diff line
@@ -78,12 +78,11 @@ 
                    latin:keyXPos="24.875%p" />

                <Key

                    latin:keyStyle="num0KeyStyle" />

                <Spacer />

                <Key

                    latin:keyStyle="shortcutOrSettingsKeyStyle"

                <Spacer

                    latin:keyXPos="-11.00%p"

                    latin:keyWidth="fillRight"

                    latin:keyEdgeFlags="right" />

                    latin:keyWidth="0%p" />

                <include

                    latin:keyboardLayout="@xml/kbd_qwerty_f2" />

            </Row>

        </case>

        <!-- latin:passwordInput="false" -->
@@ -185,11 +184,11 @@ 
                <Key

                    latin:keyLabel="#"

                    latin:keyStyle="numLabelStyle" />

                <Key

                    latin:keyStyle="shortcutOrSettingsKeyStyle"

                <Spacer

                    latin:keyXPos="-11.00%p"

                    latin:keyWidth="fillBoth"

                    latin:keyEdgeFlags="right" />

                    latin:keyWidth="0%p" />

                <include

                    latin:keyboardLayout="@xml/kbd_qwerty_f2" />

            </Row>

        </default>

    </switch>

java/res/xml-sw600dp/kbd_phone.xml

+4 −4
Original line number Diff line number Diff line
@@ -115,10 +115,10 @@ 
        <Key

            latin:keyLabel="#"

            latin:keyStyle="numLabelStyle" />

        <Key

            latin:keyStyle="shortcutOrSettingsKeyStyle"

        <Spacer

            latin:keyXPos="-11.00%p"

            latin:keyWidth="fillBoth"

            latin:keyEdgeFlags="right" />

            latin:keyWidth="0%p" />

        <include

            latin:keyboardLayout="@xml/kbd_qwerty_f2" />

    </Row>

</Keyboard>

java/res/xml-sw600dp/kbd_phone_symbols.xml

+4 −4
Original line number Diff line number Diff line
@@ -125,10 +125,10 @@ 
        <Key

            latin:keyLabel="#"

            latin:keyStyle="numLabelStyle" />

        <Key

            latin:keyStyle="shortcutOrSettingsKeyStyle"

        <Spacer

            latin:keyXPos="-11.00%p"

            latin:keyWidth="fillBoth"

            latin:keyEdgeFlags="right" />

            latin:keyWidth="0%p" />

        <include

            latin:keyboardLayout="@xml/kbd_qwerty_f2" />

    </Row>

</Keyboard>