diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-05-17 01:16:50 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-05-17 01:16:50 -0700 |
| commit | 79daef2e9b29b67048cd052b33c88675a0c62220 (patch) | |
| tree | 5c4be56a31aa829337e31cafc1d4785ed5baf3be /java | |
| parent | f579f51b0444cfe613c3edefedaae33c629b6860 (diff) | |
| parent | 71b047e3018555690ec3e4a639b395f1f79e1e67 (diff) | |
| download | latinime-79daef2e9b29b67048cd052b33c88675a0c62220.tar.gz latinime-79daef2e9b29b67048cd052b33c88675a0c62220.tar.xz latinime-79daef2e9b29b67048cd052b33c88675a0c62220.zip | |
am 71b047e3: Merge "Don\'t deactivate the LastComposedWord on shift" into jb-dev
* commit '71b047e3018555690ec3e4a639b395f1f79e1e67':
Don't deactivate the LastComposedWord on shift
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index b59e939b7..261755f53 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1298,8 +1298,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen break; } switcher.onCodeInput(primaryCode); - // Reset after any single keystroke - if (!didAutoCorrect) + // Reset after any single keystroke, except shift and symbol-shift + if (!didAutoCorrect && primaryCode != Keyboard.CODE_SHIFT + && primaryCode != Keyboard.CODE_SWITCH_ALPHA_SYMBOL) mLastComposedWord.deactivate(); mEnteredText = null; } |