From 576f8a5b72b550c5d610ccf9014e19db4a9cb8c9 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Tue, 28 Jan 2014 16:54:07 +0900 Subject: Fix inconsistent behavior with the back-to-the-main-keyboard key With this patch, the back-to-the-main-keyboard in the Emoji palette will be registered as a key-release action instead of a key-press action, like switch-to-the-emoji-palette in the main layout. This provides mroe consistent UX when the layout is switched from the main layout to the Emoji palette then switched back to the main layout. BUG: 12464067 Change-Id: Ia0d0185db43234dfcfb7cee2677f3d199fe6ed96 --- java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java') diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java index 43d75330d..16e032051 100644 --- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java +++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java @@ -349,6 +349,10 @@ public final class InputLogic { didAutoCorrect = handleNonSpecialCharacter(settingsValues, Constants.CODE_ENTER, x, y, spaceState, keyboardSwitcher, handler); break; + case Constants.CODE_ALPHA_FROM_EMOJI: + // Note: Switching back from Emoji keyboard to the main keyboard is being handled in + // {@link KeyboardState#onCodeInput(int,int)}. + break; default: didAutoCorrect = handleNonSpecialCharacter(settingsValues, code, x, y, spaceState, keyboardSwitcher, handler); -- cgit v1.2.3-83-g751a