aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-02-03 06:10:00 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-03 06:10:00 -0800
commit3b2c4f5525bba52e479d6096e1ec29222d078606 (patch)
tree3292bbea84da044b5718956c4993df1f310d9c5a /java/src
parent5d694da34aebe6cd3176f5b49bac372e6dd02885 (diff)
parent80fa64e66bd6ecfff783aee3e49df326f352c264 (diff)
downloadlatinime-3b2c4f5525bba52e479d6096e1ec29222d078606.tar.gz
latinime-3b2c4f5525bba52e479d6096e1ec29222d078606.tar.xz
latinime-3b2c4f5525bba52e479d6096e1ec29222d078606.zip
am 80fa64e6: Merge "Don\'t resume suggestions if suggestions are not requested."
* commit '80fa64e66bd6ecfff783aee3e49df326f352c264': Don't resume suggestions if suggestions are not requested.
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
index 1bc67b2a0..f53183f37 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
@@ -1142,6 +1142,8 @@ public final class InputLogic {
// Recorrection is not supported in languages without spaces because we don't know
// how to segment them yet.
if (!settingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces) return;
+ // If no suggestions are requested, don't try restarting suggestions.
+ if (!settingsValues.isSuggestionsRequested()) return;
// If the cursor is not touching a word, or if there is a selection, return right away.
if (mConnection.hasSelection()) return;
// If we don't know the cursor location, return.