From 5d8f6660bfd7b9e8a04d8deff8127f07b8d56e69 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Wed, 26 Feb 2014 16:26:16 +0900 Subject: [PATCH] [IL113] More cleanup We should not test punctuation with this equality test any more. Also, whether the suggestion strip is displayed or not, or whether the hint is displayed or not, has nothing to do with this method and should be handled elsewhere rather than here -- and as a matter of fact, it is, which makes this useless. Bug: 8636060 Change-Id: I6a54ee87e4e9f81bc33158acf4a264c3abd5829d --- .../com/android/inputmethod/latin/LatinIME.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 020dd87d4..3c5c8bf70 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1450,17 +1450,13 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen // 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 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 - || !hasSuggestionStripView() || isShowingAddToDictionaryHint()) { + // a deletion typically), we do want to remove the old suggestions. + if (suggestedWords.size() > 1 || typedWord.length() <= 1) { return suggestedWords; } else { - final SuggestedWords punctuationList = - mSettings.getCurrent().mSpacingAndPunctuations.mSuggestPuncList; - final SuggestedWords oldSuggestedWords = previousSuggestedWords == punctuationList - ? SuggestedWords.EMPTY : previousSuggestedWords; + final SuggestedWords oldSuggestedWords = + previousSuggestedWords.isPunctuationSuggestions() ? SuggestedWords.EMPTY + : previousSuggestedWords; final ArrayList typedWordAndPreviousSuggestions = SuggestedWords.getTypedWordAndPreviousSuggestions(typedWord, oldSuggestedWords); return new SuggestedWords(typedWordAndPreviousSuggestions, null /* rawSuggestions */,