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

Unverified Commit fe5887da authored by Timi Rautamäki's avatar Timi Rautamäki Committed by Michael Bestas
Browse files

LatinIME: show emoji key when language switch key is not showing 

* Keep it hidden when language switch is visible
  since there is no room for more keys.
* Make the emoji key look like other keys.
* Remove the additional emoji key from enter and
  more keys menu.

Change-Id: I45bc72d833e2737b40bbfeac1bf175b8ebab2b7b
parent d627d973

java/res/xml-sw600dp/key_styles_common.xml

+5 −0
Original line number Diff line number Diff line
@@ -108,6 +108,11 @@ 
        latin:keySpec="!icon/emoji_normal_key|!code/key_emoji"

        latin:keyActionFlags="noKeyPreview"

        latin:backgroundType="functional" />

    <key-style

        latin:styleName="emojiKeyStylePopup"

        latin:keySpec="!icon/emoji_action_key|!code/key_emoji"

        latin:keyActionFlags="noKeyPreview"

        latin:backgroundType="functional" />

    <key-style

        latin:styleName="settingsKeyStyle"

        latin:keySpec="!icon/settings_key|!code/key_settings"

java/res/xml/key_emoji.xml

+8 −3
Original line number Diff line number Diff line
@@ -26,13 +26,18 @@ 
            latin:mode="email|url"

        >

            <Key

                latin:keyStyle="comKeyStyle"

                latin:keyStyle="comKeyStyle" />

        </case>

        <case

            latin:languageSwitchKeyEnabled="true"

        >

            <Key

                latin:keyStyle="emojiKeyStylePopup"

                latin:keyWidth="fillRight" />

        </case>

        <default>

            <Key

                latin:keyStyle="emojiKeyStyle"

                latin:keyWidth="fillRight" />

                latin:keyStyle="emojiKeyStyle" />

        </default>

    </switch>

</merge>

java/res/xml/key_space_5kw.xml

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
        <default>

            <Key

                latin:keyStyle="spaceKeyStyle"

                latin:keyWidth="50%p" />

                latin:keyWidth="40%p" />

        </default>

    </switch>

</merge>

java/res/xml/key_styles_common.xml

+5 −0
Original line number Diff line number Diff line
@@ -79,6 +79,11 @@ 
    <!-- emojiKeyStyle must be defined before including @xml/key_syles_enter. -->

    <key-style

        latin:styleName="emojiKeyStyle"

        latin:keySpec="!icon/emoji_normal_key|!code/key_emoji"

        latin:keyActionFlags="noKeyPreview"

        latin:backgroundType="functional" />

    <key-style

        latin:styleName="emojiKeyStylePopup"

        latin:keySpec="!icon/emoji_action_key|!code/key_emoji"

        latin:keyLabelFlags="keepBackgroundAspectRatio"

        latin:keyActionFlags="noKeyPreview"

java/res/xml/key_styles_enter.xml

+1 −0
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ 
             This <case> should be after Shift + Enter <case> and before any of action <case>. -->

        <case

            latin:mode="im"

            latin:languageSwitchKeyEnabled="true"

        >

            <key-style

                latin:styleName="enterKeyStyle"