nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

* commit '25c90e6d51aeca5dce05b5adb691876b55a142d5':
  Don't do recorrection when suggestions are off.
main
Jean Chalard 2013-04-30 19:19:04 -07:00 committed by Android Git Automerger
parent b4251873b0 25c90e6d51
commit ace3f3c5d5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java/src/com/android/inputmethod/latin/LatinIME.java
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,
// unless suggestions are off.
if (isSuggestionsStripVisible()) {
mHandler.postResumeSuggestions(); 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())