Merge "Don't deactivate the LastComposedWord on shift" into jb-dev

2012-05-17 01:15:02 -07:00 · 2012-05-17 01:15:02 -07:00 · 71b047e301
parent a1500959b6 125de3dfdf
commit 71b047e301
1 changed files with 3 additions and 2 deletions
--- 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;
    }