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

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

Merge "Shift + smiley key become return key"

parents 825e2bbd 56d1dc5a

java/res/xml/key_styles_common.xml

+26 −12
Original line number Diff line number Diff line
@@ -99,11 +99,26 @@ 
        latin:keyActionFlags="isRepeatable|noKeyPreview"

        latin:backgroundType="functional" />

    <!-- Return key style -->

    <key-style

        latin:styleName="defaultReturnKeyStyle"

        latin:code="@integer/key_return"

        latin:keyIcon="iconReturnKey"

        latin:keyActionFlags="noKeyPreview"

        latin:backgroundType="functional" />

    <switch>

        <case

            latin:mode="im"

        >

            <!-- Smiley key. -->

            <switch>

                <case

                    latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted"

                >

                    <key-style

                        latin:styleName="returnKeyStyle"

                        latin:parentStyle="defaultReturnKeyStyle" />

                </case>

                <default>

                    <key-style

                        latin:styleName="returnKeyStyle"

                        latin:keyLabel=":-)"
@@ -112,6 +127,8 @@ 
                        latin:moreKeys="@string/more_keys_for_smiley"

                        latin:maxMoreKeysColumn="5"

                        latin:backgroundType="functional" />

                </default>

            </switch>

        </case>

        <case

            latin:imeAction="actionGo"
@@ -171,10 +188,7 @@ 
        <default>

            <key-style

                latin:styleName="returnKeyStyle"

                latin:code="@integer/key_return"

                latin:keyIcon="iconReturnKey"

                latin:keyActionFlags="noKeyPreview"

                latin:backgroundType="functional" />

                latin:parentStyle="defaultReturnKeyStyle" />

        </default>

    </switch>

    <key-style