diff options
| author |   Yohei Yukawa <yukawa@google.com> | 2014-01-28 02:52:23 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-01-28 02:52:23 -0800 |
| commit | dfcc8b9443314dee8e36d42c67a8fcfd63499529 (patch) | |
| tree | d201ca0cc1fff2e68a87145b5cfaa1048dd75628 /java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java | |
| parent | 1fe68195bd890e10966c16b56bf29b9527aaa46b (diff) | |
| parent | be18530acfc3364aa77dda8184318311c4fb60f2 (diff) | |
| download | latinime-dfcc8b9443314dee8e36d42c67a8fcfd63499529.tar.gz latinime-dfcc8b9443314dee8e36d42c67a8fcfd63499529.tar.xz latinime-dfcc8b9443314dee8e36d42c67a8fcfd63499529.zip | |
am be18530a: Merge "Fix inconsistent behavior with the back-to-the-main-keyboard key"
* commit 'be18530acfc3364aa77dda8184318311c4fb60f2':
Fix inconsistent behavior with the back-to-the-main-keyboard key
Diffstat (limited to 'java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java index bbeb74b65..ce3ef5374 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); |