| commit | d08f9e0141309315fcaafff0ca5b413c6255981b | [log] [tgz] |
|---|---|---|
| author | Georg Veichtlbauer <georg@vware.at> | Mon Sep 11 08:59:39 2023 +0200 |
| committer | Georg Veichtlbauer <georg@vware.at> | Mon Nov 20 21:09:49 2023 +0100 |
| tree | b150e216e2fe7734c260aab0a52fe9e697a1fbfb | |
| parent | 2174f2ad2a226e47358bdd3c93e17494b94077ba [diff] |
LatinIME: Never use emoji action key in place of enter Change-Id: I3359bcee3da4fc7fbdfe655e959d25c26d8cf585
diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml index ec82898..56065a8 100644 --- a/java/res/xml/key_styles_enter.xml +++ b/java/res/xml/key_styles_enter.xml
@@ -248,13 +248,6 @@ <!-- 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" > <key-style
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/LayoutCustomizer.java b/tests/src/com/android/inputmethod/keyboard/layout/customizer/LayoutCustomizer.java index 27f5534..8caa447 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/LayoutCustomizer.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/customizer/LayoutCustomizer.java
@@ -161,7 +161,7 @@ * @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; } /**