am 442ac5d0: Merge "Don\'t ask for surrounding characters for each keypress" into jb-dev

* commit '442ac5d0bb96ec257d26b28df2fabefdefe59b96':
  Don't ask for surrounding characters for each keypress
This commit is contained in:
Jean Chalard 2012-05-09 01:55:43 -07:00 committed by Android Git Automerger
commit 4e02b1273b

View File

@ -1489,8 +1489,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if ((isAlphabet(primaryCode) if ((isAlphabet(primaryCode)
|| mSettingsValues.isSymbolExcludedFromWordSeparators(primaryCode)) || mSettingsValues.isSymbolExcludedFromWordSeparators(primaryCode))
&& isSuggestionsRequested() && !isCursorTouchingWord()) { && isSuggestionsRequested() && !isComposingWord && !isCursorTouchingWord()) {
if (!isComposingWord) {
// Reset entirely the composing state anyway, then start composing a new word unless // 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 // 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 // separator and it should be treated as a normal character, except in the first
@ -1503,7 +1502,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
resetComposingState(false /* alsoResetLastComposedWord */); resetComposingState(false /* alsoResetLastComposedWord */);
clearSuggestions(); clearSuggestions();
} }
}
if (isComposingWord) { if (isComposingWord) {
mWordComposer.add( mWordComposer.add(
primaryCode, x, y, mKeyboardSwitcher.getKeyboardView().getKeyDetector()); primaryCode, x, y, mKeyboardSwitcher.getKeyboardView().getKeyDetector());