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

Commit 8529a39d authored by Georg Veichtlbauer's avatar Georg Veichtlbauer
Browse files

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

This reverts commit fe5887da.

Change-Id: I202f07521b9509e61dd22f2e3a30c178a0a328cd
parent dbdcbeaa

java/res/xml-sw600dp/key_styles_common.xml

+0 −5
Original line number Diff line number Diff line
@@ -108,11 +108,6 @@ 
        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

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

        >

            <Key

                latin:keyStyle="comKeyStyle" />

        </case>

        <case

            latin:languageSwitchKeyEnabled="true"

        >

            <Key

                latin:keyStyle="emojiKeyStylePopup"

                latin:keyStyle="comKeyStyle"

                latin:keyWidth="fillRight" />

        </case>

        <default>

            <Key

                latin:keyStyle="emojiKeyStyle" />

                latin:keyStyle="emojiKeyStyle"

                latin:keyWidth="fillRight" />

        </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="40%p" />

                latin:keyWidth="50%p" />

        </default>

    </switch>

</merge>

java/res/xml/key_styles_common.xml

+0 −5
Original line number Diff line number Diff line
@@ -79,11 +79,6 @@ 
    <!-- 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

+0 −1
Original line number Diff line number Diff line
@@ -259,7 +259,6 @@ 
             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"