diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-05-21 11:52:11 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-05-21 11:52:11 -0700 |
| commit | 8717ad4cbd1698810335d7e758e073a33a968422 (patch) | |
| tree | 80be0c119627482bfba0ca6583bd884bcb195629 /java/src | |
| parent | ef674f677ca4def1967b310a8f7f686c3c77bfe9 (diff) | |
| parent | 79daef2e9b29b67048cd052b33c88675a0c62220 (diff) | |
| download | latinime-8717ad4cbd1698810335d7e758e073a33a968422.tar.gz latinime-8717ad4cbd1698810335d7e758e073a33a968422.tar.xz latinime-8717ad4cbd1698810335d7e758e073a33a968422.zip | |
am 79daef2e: am 71b047e3: Merge "Don\'t deactivate the LastComposedWord on shift" into jb-dev
* commit '79daef2e9b29b67048cd052b33c88675a0c62220':
Don't deactivate the LastComposedWord on shift
Diffstat (limited to 'java/src')
| -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 28dcb1e89..bb408ef93 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1307,8 +1307,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; } |