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

Commit ef64676b authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android (Google) Code Review
Browse files

Merge "Revert emoji key position to JB-mr2"

parents 4aefcf78 5a54a576

java/res/xml-sw600dp/rows_symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -68,5 +68,7 @@ 
            latin:keyWidth="10.0%p" />

        <include

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

        <include

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

    </Row>

</merge>

java/res/xml/key_styles_common.xml

+21 −0
Original line number Diff line number Diff line
@@ -121,6 +121,27 @@ 
        latin:keyIcon="!icon/emoji_key"

        latin:keyActionFlags="noKeyPreview"

        latin:backgroundType="functional" />

    <!-- Overriding EnterKeyStyle here -->

    <switch>

        <!-- Shift + Enter in textMultiLine field. -->

        <case

            latin:isMultiLine="true"

            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"

        >

            <key-style

                latin:styleName="enterKeyStyle"

                latin:parentStyle="shiftEnterKeyStyle" />

        </case>

        <!-- Smiley in textShortMessage field.

             Overrides common enter key style. -->

        <case

            latin:mode="im"

        >

            <key-style

                latin:styleName="enterKeyStyle"

                latin:parentStyle="emojiKeyStyle" />

        </case>

    </switch>

    <key-style

        latin:styleName="tabKeyStyle"

        latin:code="!code/key_tab"

java/res/xml/row_symbols4.xml

+0 −4
Original line number Diff line number Diff line
@@ -39,8 +39,4 @@ 
    <include latin:keyboardLayout="@xml/key_space_symbols" />

    <include latin:keyboardLayout="@xml/keys_comma_period" />



    <Key

        latin:keyStyle="emojiKeyStyle"

        latin:keyWidth="fillRight" />



</merge>

java/res/xml/rows_symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -60,5 +60,8 @@ 
            latin:keyWidth="15%p" />

        <include

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

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillRight" />

    </Row>

</merge>