LatinIME: Never use emoji action key in place of enter

Change-Id: I3359bcee3da4fc7fbdfe655e959d25c26d8cf585

java/res/xml/key_styles_enter.xml

@@ -247,13 +247,6 @@
         </case>
         <!-- Smiley in textShortMessage field.
              This <case> should be after Shift + Enter <case> and before any of action <case>. -->
-        <case
-            latin:mode="im"
-        >
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:parentStyle="emojiKeyStyle" />
-        </case>
         <case
             latin:imeAction="actionGo"
         >

tests/src/com/android/inputmethod/keyboard/layout/customizer/LayoutCustomizer.java

@@ -161,7 +161,7 @@ public class LayoutCustomizer extends AbstractLayoutBase {
      * @return the array of {@link ExpectedKey} that should be placed as an enter key.
      */
     public ExpectedKey getEnterKey(final boolean isPhone) {
-        return isPhone ? key(ENTER_KEY, EMOJI_ACTION_KEY) : ENTER_KEY;
+        return ENTER_KEY;
     }
 
     /**