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

Commit 8ff1e71f authored by Satoshi Kataoka's avatar Satoshi Kataoka
Browse files

Do not merge. Fix keyboard layout 

- Show "..." on enter key if it has long-pressing emoji key
- Show enter key on symbols shift keyboard

Bug: 11262889
Bug: 11263464
Change-Id: I3797fe2ef8c1e4cbba3298475f01f90c98e3335f
parent cf0a94fa

java/res/xml-sw600dp/rows_symbols_shift.xml

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

        <include

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

        <include

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

    </Row>

</merge>

java/res/xml/key_styles_enter.xml

+3 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ 
        >

            <key-style

                latin:styleName="navigateMoreKeysStyle"

                latin:keyLabelFlags="hasPopupHint|preserveCase"

                latin:moreKeys="!text/emoji_key_as_more_key" />

        </case>

        <case
@@ -207,6 +208,7 @@ 
        >

            <key-style

                latin:styleName="navigateMoreKeysStyle"

                latin:keyLabelFlags="hasPopupHint|preserveCase"

                latin:moreKeys="!text/emoji_key_as_more_key" />

        </case>

        <case
@@ -242,6 +244,7 @@ 
        >

            <key-style

                latin:styleName="navigateMoreKeysStyle"

                latin:keyLabelFlags="hasPopupHint|preserveCase"

                latin:moreKeys="!text/emoji_key_as_more_key" />

        </case>

        <default>

java/res/xml/row_symbols_shift4.xml

+0 −4
Original line number Diff line number Diff line
@@ -23,8 +23,4 @@ 
    <include

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

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



    <include

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



</merge>

java/res/xml/rows_symbols_shift.xml

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

        <include

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

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillRight" />

    </Row>

</merge>