nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

* commit 'ffb086c18df1f1a03be5cc9860de224d94138c50':
  Don't override application-specified completions
main
Jean Chalard 2014-06-27 09:11:37 +00:00 committed by Android Git Automerger
parent eb85cdce36 ffb086c18d
commit c60b6f21b9
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/src/com/android/inputmethod/latin/LatinIME.java
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;