am ace3f3c5: am 25c90e6d: Merge "Don\'t do recorrection when suggestions are off." into jb-mr2-dev

* commit 'ace3f3c5d56f5b4a58e8dc400fec1bb8c7b17a63':
  Don't do recorrection when suggestions are off.
main
Jean Chalard 2013-04-30 19:22:13 -07:00 committed by Android Git Automerger
commit 019c38060d
1 changed files with 7 additions and 2 deletions

View File

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