am 79daef2e: am 71b047e3: Merge "Don\'t deactivate the LastComposedWord on shift" into jb-dev

* commit '79daef2e9b29b67048cd052b33c88675a0c62220':
  Don't deactivate the LastComposedWord on shift
main
Jean Chalard 2012-05-21 11:52:11 -07:00 committed by Android Git Automerger
commit 8717ad4cbd
1 changed files with 3 additions and 2 deletions

View File

@ -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;
}