Merge "Don't override application-specified completions"

main
Jean Chalard 2014-06-27 09:09:00 +00:00 committed by Android (Google) Code Review
commit ffb086c18d
1 changed files with 3 additions and 0 deletions

View File

@ -1001,6 +1001,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if (!mSettings.getCurrent().isApplicationSpecifiedCompletionsOn()) { if (!mSettings.getCurrent().isApplicationSpecifiedCompletionsOn()) {
return; 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) { if (applicationSpecifiedCompletions == null) {
setNeutralSuggestionStrip(); setNeutralSuggestionStrip();
return; return;