From 09fdd30e5261990ace636c52a8330d4c5dbb364b Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Fri, 6 Jul 2012 16:20:04 +0900 Subject: [PATCH] Simplification (A78) Change-Id: I622503af858ef419e94a17f182253cb03da00462 --- .../com/android/inputmethod/latin/LatinIME.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 7b4aedeb6..f30a75b6b 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1702,13 +1702,13 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen private SuggestedWords maybeRetrieveOlderSuggestions(final CharSequence typedWord, final SuggestedWords suggestedWords) { // TODO: consolidate this into getSuggestedWords - // Basically, we update the suggestion strip only when suggestion count > 1. However, - // there is an exception: We update the suggestion strip whenever typed word's length - // is 1 or typed word is found in dictionary, regardless of suggestion count. Actually, - // in most cases, suggestion count is 1 when typed word's length is 1, but we do always - // need to clear the previous state when the user starts typing a word (i.e. typed word's - // length == 1). - if (suggestedWords.size() > 1 || typedWord.length() == 1 || !mWordComposer.isComposingWord() + // We update the suggestion strip only when we have some suggestions to show, i.e. when + // the suggestion count is > 1; else, we leave the old suggestions, with the typed word + // replaced with the new one. However, when the word is a dictionary word, or when the + // length of the typed word is 1 or 0 (after a deletion typically), we do want to remove the + // old suggestions. Also, if we are showing the "add to dictionary" hint, we need to + // revert to suggestions - although it is unclear how we can come here if it's displayed. + if (suggestedWords.size() > 1 || typedWord.length() <= 1 || !suggestedWords.mTypedWordValid || mSuggestionsView.isShowingAddToDictionaryHint()) { return suggestedWords;