am ffb086c1: Merge "Don\'t override application-specified completions"

* commit 'ffb086c18df1f1a03be5cc9860de224d94138c50': Don't override application-specified completions
2014-06-27 09:11:37 +00:00 · 2014-06-27 09:11:37 +00:00 · c60b6f21b9
parent eb85cdce36 ffb086c18d
commit c60b6f21b9
1 changed files with 3 additions and 0 deletions
--- 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;