Merge "Don't do recorrection when suggestions are off." into jb-mr2-dev
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 16eab4b..5ef2120 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -929,8 +929,11 @@
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 @@
return false;
if (mSuggestionStripView.isShowingAddToDictionaryHint())
return true;
+ if (null == mSettings.getCurrent())
+ return false;
if (!mSettings.getCurrent().isSuggestionStripVisibleInOrientation(mDisplayOrientation))
return false;
if (mSettings.getCurrent().isApplicationSpecifiedCompletionsOn())
