aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-02-03 06:45:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-02-03 06:45:45 +0000
commit5d9be8039cf2321f42c3206594921430c06f7642 (patch)
tree4144c6f32ebf9aaf500c83fb56bc697771dc60ac /java/src
parent38f341a2a53a04ce4195a0cb99fcb6e71203dec0 (diff)
parent2cbf152986a67ddffa909111718bb8d2dc80e5d7 (diff)
downloadlatinime-5d9be8039cf2321f42c3206594921430c06f7642.tar.gz
latinime-5d9be8039cf2321f42c3206594921430c06f7642.tar.xz
latinime-5d9be8039cf2321f42c3206594921430c06f7642.zip
Merge "Have empty suggestions go through setNeutralSuggestions."
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 208cf22a6..2c7ef70a3 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1408,10 +1408,12 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// because it may differ from mWordComposer.mTypedWord.
autoCorrection = sourceSuggestedWords.mTypedWord;
}
- if (SuggestedWords.EMPTY != suggestedWords) {
+ if (SuggestedWords.EMPTY == suggestedWords) {
+ setNeutralSuggestionStrip();
+ } else {
mInputLogic.mWordComposer.setAutoCorrection(autoCorrection);
+ setSuggestedWords(suggestedWords, isSuggestionsStripVisible());
}
- setSuggestedWords(suggestedWords, isSuggestionsStripVisible());
// Cache the auto-correction in accessibility code so we can speak it if the user
// touches a key that will insert it.
AccessibilityUtils.getInstance().setAutoCorrection(suggestedWords,