Merge "Don't ask for surrounding characters for each keypress" into jb-dev

This commit is contained in:
Jean Chalard 2012-05-08 23:38:53 -07:00 committed by Android (Google) Code Review
commit 442ac5d0bb

View file

@ -1480,8 +1480,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if ((isAlphabet(primaryCode)
|| mSettingsValues.isSymbolExcludedFromWordSeparators(primaryCode))
&& isSuggestionsRequested() && !isCursorTouchingWord()) {
if (!isComposingWord) {
&& isSuggestionsRequested() && !isComposingWord && !isCursorTouchingWord()) {
// Reset entirely the composing state anyway, then start composing a new word unless
// the character is a single quote. The idea here is, single quote is not a
// separator and it should be treated as a normal character, except in the first
@ -1494,7 +1493,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
resetComposingState(false /* alsoResetLastComposedWord */);
clearSuggestions();
}
}
if (isComposingWord) {
mWordComposer.add(
primaryCode, x, y, mKeyboardSwitcher.getKeyboardView().getKeyDetector());