diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-02-03 06:09:57 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-02-03 06:09:57 -0800 |
| commit | 5d694da34aebe6cd3176f5b49bac372e6dd02885 (patch) | |
| tree | a5cb4426177bcb6b0305a46dd709263e2b5efa15 /java/src/com/android/inputmethod | |
| parent | 9798bc12e3418e7d5b2aba7b7ae06c118fbae36c (diff) | |
| parent | 5d9be8039cf2321f42c3206594921430c06f7642 (diff) | |
| download | latinime-5d694da34aebe6cd3176f5b49bac372e6dd02885.tar.gz latinime-5d694da34aebe6cd3176f5b49bac372e6dd02885.tar.xz latinime-5d694da34aebe6cd3176f5b49bac372e6dd02885.zip | |
am 5d9be803: Merge "Have empty suggestions go through setNeutralSuggestions."
* commit '5d9be8039cf2321f42c3206594921430c06f7642':
Have empty suggestions go through setNeutralSuggestions.
Diffstat (limited to 'java/src/com/android/inputmethod')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 208cf22a6..2c7ef70a3 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -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, |