Merge "Don't do recorrection when suggestions are off." into jb-mr2-dev

This commit is contained in:
Jean Chalard 2013-05-01 02:16:19 +00:00 committed by Android (Google) Code Review
commit 25c90e6d51

View file

@ -929,8 +929,11 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
resetEntireInputState(newSelStart); resetEntireInputState(newSelStart);
} }
// We moved the cursor. If we are touching a word, we need to resume suggestion. // We moved the cursor. If we are touching a word, we need to resume suggestion,
mHandler.postResumeSuggestions(); // unless suggestions are off.
if (isSuggestionsStripVisible()) {
mHandler.postResumeSuggestions();
}
// Reset the last recapitalization. // Reset the last recapitalization.
mRecapitalizeStatus.deactivate(); mRecapitalizeStatus.deactivate();
mKeyboardSwitcher.updateShiftState(); mKeyboardSwitcher.updateShiftState();
@ -2108,6 +2111,8 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
return false; return false;
if (mSuggestionStripView.isShowingAddToDictionaryHint()) if (mSuggestionStripView.isShowingAddToDictionaryHint())
return true; return true;
if (null == mSettings.getCurrent())
return false;
if (!mSettings.getCurrent().isSuggestionStripVisibleInOrientation(mDisplayOrientation)) if (!mSettings.getCurrent().isSuggestionStripVisibleInOrientation(mDisplayOrientation))
return false; return false;
if (mSettings.getCurrent().isApplicationSpecifiedCompletionsOn()) if (mSettings.getCurrent().isApplicationSpecifiedCompletionsOn())