From aa3a96f3a1c5aeacefdfd6e6a33e58c9d9c49553 Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Tue, 30 Apr 2013 14:23:55 +0900
Subject: [PATCH] Don't do recorrection when suggestions are off.

Bug: 8767981
Change-Id: If5c775e488b91ae03ecce2673c99918ac8134928
---
 java/src/com/android/inputmethod/latin/LatinIME.java | 9 +++++++--
 1 file 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())