diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-04-30 19:23:31 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-04-30 19:23:31 -0700 |
| commit | 4aa48aedda0a8f945efbc94f1f5beb355d1c6060 (patch) | |
| tree | 032648ea6fadc22290a7ecc10f3c76a6d95ed57a /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | d2ea99b7b4e0421a0c0d7ede8301c4a270038a9d (diff) | |
| parent | 019c38060d8479e26895f94e00fa53586ce28a70 (diff) | |
| download | latinime-4aa48aedda0a8f945efbc94f1f5beb355d1c6060.tar.gz latinime-4aa48aedda0a8f945efbc94f1f5beb355d1c6060.tar.xz latinime-4aa48aedda0a8f945efbc94f1f5beb355d1c6060.zip | |
am 019c3806: am ace3f3c5: am 25c90e6d: Merge "Don\'t do recorrection when suggestions are off." into jb-mr2-dev
* commit '019c38060d8479e26895f94e00fa53586ce28a70':
Don't do recorrection when suggestions are off.
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 9 |
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()) |