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

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

Merge "Add CODE_CAPSLOCK for long press shift key"

parents ad0c6d7b 9552badf

java/res/xml-sw600dp/key_styles_common.xml

+13 −9
Original line number Diff line number Diff line
@@ -36,34 +36,38 @@ 
        </default>

    </switch>

    <!-- Functional key styles -->

    <!-- Base style for shift key. A single space is used for dummy label in moreKeys. -->

    <key-style

        latin:styleName="baseForShiftKeyStyle"

        latin:code="!code/key_shift"

        latin:keyActionFlags="noKeyPreview"

        latin:keyLabelFlags="preserveCase"

        latin:moreKeys="!noPanelAutoMoreKey!, |!code/key_capslock" />

    <switch>

        <case

            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetAutomaticShifted"

        >

            <key-style

                latin:styleName="shiftKeyStyle"

                latin:code="!code/key_shift"

                latin:keyIcon="!icon/shift_key_shifted"

                latin:keyActionFlags="noKeyPreview"

                latin:backgroundType="stickyOff" />

                latin:backgroundType="stickyOff"

                latin:parentStyle="baseForShiftKeyStyle" />

        </case>

        <case

            latin:keyboardLayoutSetElement="alphabetShiftLocked|alphabetShiftLockShifted"

        >

            <key-style

                latin:styleName="shiftKeyStyle"

                latin:code="!code/key_shift"

                latin:keyIcon="!icon/shift_key_shifted"

                latin:keyActionFlags="noKeyPreview"

                latin:backgroundType="stickyOn" />

                latin:backgroundType="stickyOn"

                latin:parentStyle="baseForShiftKeyStyle" />

        </case>

        <default>

            <key-style

                latin:styleName="shiftKeyStyle"

                latin:code="!code/key_shift"

                latin:keyIcon="!icon/shift_key"

                latin:keyActionFlags="noKeyPreview"

                latin:backgroundType="stickyOff" />

                latin:backgroundType="stickyOff"

                latin:parentStyle="baseForShiftKeyStyle" />

        </default>

    </switch>

    <key-style

java/res/xml-sw768dp/key_styles_common.xml

+13 −9
Original line number Diff line number Diff line
@@ -35,34 +35,38 @@ 
                latin:keyLabelFlags="hasShiftedLetterHint" />

        </default>

    </switch>

    <!-- Base style for shift key. A single space is used for dummy label in moreKeys. -->

    <key-style

        latin:styleName="baseForShiftKeyStyle"

        latin:code="!code/key_shift"

        latin:keyActionFlags="noKeyPreview"

        latin:keyLabelFlags="preserveCase"

        latin:moreKeys="!noPanelAutoMoreKey!, |!code/key_capslock" />

    <switch>

        <case

            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetAutomaticShifted"

        >

            <key-style

                latin:styleName="shiftKeyStyle"

                latin:code="!code/key_shift"

                latin:keyIcon="!icon/shift_key_shifted"

                latin:keyActionFlags="noKeyPreview"

                latin:backgroundType="stickyOff" />

                latin:backgroundType="stickyOff"

                latin:parentStyle="baseForShiftKeyStyle" />

        </case>

        <case

            latin:keyboardLayoutSetElement="alphabetShiftLocked|alphabetShiftLockShifted"

        >

            <key-style

                latin:styleName="shiftKeyStyle"

                latin:code="!code/key_shift"

                latin:keyIcon="!icon/shift_key_shifted"

                latin:keyActionFlags="noKeyPreview"

                latin:backgroundType="stickyOn" />

                latin:backgroundType="stickyOn"

                latin:parentStyle="baseForShiftKeyStyle" />

        </case>

        <default>

            <key-style

                latin:styleName="shiftKeyStyle"

                latin:code="!code/key_shift"

                latin:keyIcon="!icon/shift_key"

                latin:keyActionFlags="noKeyPreview"

                latin:backgroundType="stickyOff" />

                latin:backgroundType="stickyOff"

                latin:parentStyle="baseForShiftKeyStyle" />

        </default>

    </switch>

    <key-style

java/res/xml/key_styles_common.xml

+13 −9
Original line number Diff line number Diff line
@@ -25,34 +25,38 @@ 
    <include

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

    <!-- Functional key styles -->

    <!-- Base style for shift key. A single space is used for dummy label in moreKeys. -->

    <key-style

        latin:styleName="baseForShiftKeyStyle"

        latin:code="!code/key_shift"

        latin:keyActionFlags="noKeyPreview"

        latin:keyLabelFlags="preserveCase"

        latin:moreKeys="!noPanelAutoMoreKey!, |!code/key_capslock" />

    <switch>

        <case

            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetAutomaticShifted"

        >

            <key-style

                latin:styleName="shiftKeyStyle"

                latin:code="!code/key_shift"

                latin:keyIcon="!icon/shift_key_shifted"

                latin:keyActionFlags="noKeyPreview"

                latin:backgroundType="stickyOff" />

                latin:backgroundType="stickyOff"

                latin:parentStyle="baseForShiftKeyStyle" />

        </case>

        <case

            latin:keyboardLayoutSetElement="alphabetShiftLocked|alphabetShiftLockShifted"

        >

            <key-style

                latin:styleName="shiftKeyStyle"

                latin:code="!code/key_shift"

                latin:keyIcon="!icon/shift_key_shifted"

                latin:keyActionFlags="noKeyPreview"

                latin:backgroundType="stickyOn" />

                latin:backgroundType="stickyOn"

                latin:parentStyle="baseForShiftKeyStyle" />

        </case>

        <default>

            <key-style

                latin:styleName="shiftKeyStyle"

                latin:code="!code/key_shift"

                latin:keyIcon="!icon/shift_key"

                latin:keyActionFlags="noKeyPreview"

                latin:backgroundType="stickyOff" />

                latin:backgroundType="stickyOff"

                latin:parentStyle="baseForShiftKeyStyle" />

        </default>

    </switch>

    <key-style

java/res/xml/rows_number_normal.xml

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 
                <Key

                    latin:code="0x002F"

                    latin:keyLabel="/ :"

                    latin:moreKeys="!embeddedMoreKey!,:"

                    latin:moreKeys="!noPanelAutoMoreKey!,:"

                    latin:keyStyle="numKeyStyle" />

            </case>

            <default>

java/res/xml/rows_phone.xml

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
            latin:keyStyle="num0KeyStyle"

            latin:code="0x0030"

            latin:keyLabel="0 +"

            latin:moreKeys="!embeddedMoreKey!,+" />

            latin:moreKeys="!noPanelAutoMoreKey!,+" />

        <Key

            latin:keyStyle="numSpaceKeyStyle" />

        <Key