aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-03-06 00:56:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-06 00:56:42 -0800
commitf845b8d576f96392b43eddc627b1a7e4ab3976d1 (patch)
treee82f1028496b80198bae63f556d5cc39444461b1 /java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
parentf0922a919434fa4f76a79b9922319ebadfe963d9 (diff)
parent4da06b9a1957dcd9a937cc64ab17c84061b87ea7 (diff)
downloadlatinime-f845b8d576f96392b43eddc627b1a7e4ab3976d1.tar.gz
latinime-f845b8d576f96392b43eddc627b1a7e4ab3976d1.tar.xz
latinime-f845b8d576f96392b43eddc627b1a7e4ab3976d1.zip
am 4da06b9a: Merge "Correctly update the suggestion strip on non-resumable word"
* commit '4da06b9a1957dcd9a937cc64ab17c84061b87ea7': Correctly update the suggestion strip on non-resumable word
Diffstat (limited to 'java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java')
-rw-r--r--java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
index c3b5fb2b5..df0068266 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
@@ -1304,7 +1304,10 @@ public final class InputLogic {
SuggestedWordInfo.NOT_AN_INDEX /* indexOfTouchPointOfSecondWord */,
SuggestedWordInfo.NOT_A_CONFIDENCE /* autoCommitFirstWordConfidence */));
}
- if (!isResumableWord(settingsValues, typedWord)) return;
+ if (!isResumableWord(settingsValues, typedWord)) {
+ mSuggestionStripViewAccessor.setNeutralSuggestionStrip();
+ return;
+ }
int i = 0;
for (final SuggestionSpan span : range.getSuggestionSpansAtWord()) {
for (final String s : span.getSuggestions()) {