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

* commit '71b047e3018555690ec3e4a639b395f1f79e1e67':
  Don't deactivate the LastComposedWord on shift
main
Jean Chalard 2012-05-17 01:16:50 -07:00 committed by Android Git Automerger
commit 79daef2e9b
1 changed files with 3 additions and 2 deletions

View File

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