diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2010-12-31 03:28:35 -0800 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2010-12-31 03:28:35 -0800 |
| commit | 611044ab30769db75ce7f7d1b0a30379b7ef78c6 (patch) | |
| tree | 249f2b6ec8f0aba149751ef07cd405fa4b928ae0 /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | 1a6fba570260ca9f837e5a6874274f39a3c0a734 (diff) | |
| parent | 5f922caff80d5067c5af2bbbae2731ef25c9572a (diff) | |
| download | latinime-611044ab30769db75ce7f7d1b0a30379b7ef78c6.tar.gz latinime-611044ab30769db75ce7f7d1b0a30379b7ef78c6.tar.xz latinime-611044ab30769db75ce7f7d1b0a30379b7ef78c6.zip | |
Merge "Snap back to the previous keyboard when sliding input is canceled"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 51b56ec14..e785eb76f 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1048,8 +1048,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen return mOptionsDialog != null && mOptionsDialog.isShowing(); } - // Implementation of KeyboardViewListener - + // Implementation of {@link KeyboardActionListener}. @Override public void onCodeInput(int primaryCode, int[] keyCodes, int x, int y) { long when = SystemClock.uptimeMillis(); @@ -1132,7 +1131,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen ic.commitText(text, 1); ic.endBatchEdit(); mKeyboardSwitcher.updateShiftState(); - mKeyboardSwitcher.onKey(0); // dummy key code. + mKeyboardSwitcher.onKey(Keyboard.CODE_DUMMY); mJustReverted = false; mJustAddedAutoSpace = false; mEnteredText = text; @@ -1141,6 +1140,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen @Override public void onCancelInput() { // User released a finger outside any key + mKeyboardSwitcher.onCancelInput(); } private void handleBackspace() { @@ -1836,7 +1836,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen private void sendSpace() { sendKeyChar((char)Keyboard.CODE_SPACE); mKeyboardSwitcher.updateShiftState(); - //onKey(KEY_SPACE[0], KEY_SPACE); } public boolean preferCapitalization() { |