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

This reverts commit fe5887da11f76ad80ef4c123aaa36ea9b64cc72f.

Change-Id: I202f07521b9509e61dd22f2e3a30c178a0a328cd
Signed-off-by: Mohammad Hasan Keramat J <ikeramat@protonmail.com>

java/res/xml-sw600dp/key_styles_common.xml

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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"

java/res/xml/key_styles_navigate_more_keys.xml

@@ -52,9 +52,7 @@
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
                 latin:moreKeys="!fixedColumnOrder!3,!needsDividers!,!text/keyspec_emoji_action_key,!text/keyspec_action_previous,!text/keyspec_action_next" />
         </case>
-        <case
-            latin:languageSwitchKeyEnabled="true"
-        >
+        <default>
             <key-style
                 latin:styleName="navigateNextMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
@@ -83,36 +81,6 @@
                 latin:styleName="navigateEmojiPreviousNextMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
                 latin:moreKeys="!fixedColumnOrder!3,!needsDividers!,!text/keyspec_emoji_action_key,!icon/previous_key|!code/key_action_previous,!icon/next_key|!code/key_action_next" />
-	    </case>
-        <default>
-            <key-style
-                latin:styleName="navigateNextMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!icon/next_key|!code/key_action_next" />
-            <key-style
-                latin:styleName="navigatePreviousMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!icon/previous_key|!code/key_action_previous" />
-            <key-style
-                latin:styleName="navigatePreviousNextMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!icon/previous_key|!code/key_action_previous,!icon/next_key|!code/key_action_next" />
-            <key-style
-                latin:styleName="navigateEmojiMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="" />
-            <key-style
-                latin:styleName="navigateEmojiNextMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_emoji_action_key,!icon/next_key|!code/key_action_next" />
-            <key-style
-                latin:styleName="navigateEmojiPreviousMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!icon/previous_key|!code/key_action_previous" />
-            <key-style
-                latin:styleName="navigateEmojiPreviousNextMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!3,!needsDividers!,!icon/previous_key|!code/key_action_previous,!icon/next_key|!code/key_action_next" />
         </default>
     </switch>
 </merge>

java/res/xml/row_qwerty4.xml

@@ -21,47 +21,21 @@
 <merge
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
-    <switch>
-        <case
-            latin:languageSwitchKeyEnabled="true"
-        >
-            <Row
-                latin:keyWidth="10%p"
-            >
-                <Key
-                    latin:keyStyle="toSymbolKeyStyle"
-                    latin:keyWidth="15%p" />
-                <include
-                    latin:keyboardLayout="@xml/key_comma" />
-                <include
-                    latin:keyXPos="25%p"
-                    latin:keyboardLayout="@xml/key_space_5kw" />
-                <include
-                    latin:keyboardLayout="@xml/key_period" />
-                <Key
-                    latin:keyStyle="enterKeyStyle"
-                    latin:keyWidth="fillRight" />
-            </Row>
-        </case>
-        <default>
-            <Row
-                latin:keyWidth="10%p"
-            >
-                <Key
-                    latin:keyStyle="toSymbolKeyStyle"
-                    latin:keyWidth="15%p" />
-                <include
-                    latin:keyboardLayout="@xml/key_comma" />
-                <include
-                    latin:keyboardLayout="@xml/key_emoji" />
-                <include
-                    latin:keyboardLayout="@xml/key_space_5kw" />
-                <include
-                    latin:keyboardLayout="@xml/key_period" />
-                <Key
-                    latin:keyStyle="enterKeyStyle"
-                    latin:keyWidth="fillRight" />
-            </Row>
-        </default>
-    </switch>
+    <Row
+        latin:keyWidth="10%p"
+    >
+        <Key
+            latin:keyStyle="toSymbolKeyStyle"
+            latin:keyWidth="15%p" />
+        <include
+            latin:keyboardLayout="@xml/key_comma" />
+        <include
+            latin:keyXPos="25%p"
+            latin:keyboardLayout="@xml/key_space_5kw" />
+        <include
+            latin:keyboardLayout="@xml/key_period" />
+        <Key
+            latin:keyStyle="enterKeyStyle"
+            latin:keyWidth="fillRight" />
+    </Row>
 </merge>