aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-06-27 09:09:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-26 23:14:30 +0000
commitffb086c18df1f1a03be5cc9860de224d94138c50 (patch)
treea4b7dc74fd78cb3a0cb9d52780894e780e558ecd /java/src
parent17c5a388d6ada4dc395b52e56f8b18d63eebb863 (diff)
parente2744c6384b49b9e90837be92e78613224ea8a33 (diff)
downloadlatinime-ffb086c18df1f1a03be5cc9860de224d94138c50.tar.gz
latinime-ffb086c18df1f1a03be5cc9860de224d94138c50.tar.xz
latinime-ffb086c18df1f1a03be5cc9860de224d94138c50.zip
Merge "Don't override application-specified completions"
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index a8f9efb05..6e5e0deaa 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1001,6 +1001,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if (!mSettings.getCurrent().isApplicationSpecifiedCompletionsOn()) {
return;
}
+ // If we have an update request in flight, we need to cancel it so it does not override
+ // these completions.
+ mHandler.cancelUpdateSuggestionStrip();
if (applicationSpecifiedCompletions == null) {
setNeutralSuggestionStrip();
return;