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.

1 files changed, 7 insertions, 2 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 16eab4bc4..5ef2120c6 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -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())