am 5d9be803: Merge "Have empty suggestions go through setNeutralSuggestions."

* commit '5d9be8039cf2321f42c3206594921430c06f7642':
  Have empty suggestions go through setNeutralSuggestions.
main
Jean Chalard 2014-02-03 06:09:57 -08:00 committed by Android Git Automerger
commit 5d694da34a
1 changed files with 4 additions and 2 deletions

View File

@ -1408,10 +1408,12 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// because it may differ from mWordComposer.mTypedWord.
autoCorrection = sourceSuggestedWords.mTypedWord;
}
if (SuggestedWords.EMPTY != suggestedWords) {
if (SuggestedWords.EMPTY == suggestedWords) {
setNeutralSuggestionStrip();
} else {
mInputLogic.mWordComposer.setAutoCorrection(autoCorrection);
setSuggestedWords(suggestedWords, isSuggestionsStripVisible());
}
setSuggestedWords(suggestedWords, isSuggestionsStripVisible());
// Cache the auto-correction in accessibility code so we can speak it if the user
// touches a key that will insert it.
AccessibilityUtils.getInstance().setAutoCorrection(suggestedWords,