Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d8f6660 authored by Jean Chalard's avatar Jean Chalard
Browse files

[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
parent c92dabb2

java/src/com/android/inputmethod/latin/LatinIME.java

+5 −9
Original line number Original line Diff line number Diff line
@@ -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

        // 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

        // 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

        // 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

        // a deletion typically), we do want to remove the old suggestions.

        // the "add to dictionary" hint, we need to revert to suggestions - although it is unclear

        if (suggestedWords.size() > 1 || typedWord.length() <= 1) {

        // how we can come here if it's displayed.

        if (suggestedWords.size() > 1 || typedWord.length() <= 1

                || !hasSuggestionStripView() || isShowingAddToDictionaryHint()) {

            return suggestedWords;

            return suggestedWords;

        } else {

        } else {

            final SuggestedWords punctuationList =

            final SuggestedWords oldSuggestedWords =

                    mSettings.getCurrent().mSpacingAndPunctuations.mSuggestPuncList;

                    previousSuggestedWords.isPunctuationSuggestions() ? SuggestedWords.EMPTY

            final SuggestedWords oldSuggestedWords = previousSuggestedWords == punctuationList

                            : previousSuggestedWords;

                    ? SuggestedWords.EMPTY : previousSuggestedWords;

            final ArrayList<SuggestedWords.SuggestedWordInfo> typedWordAndPreviousSuggestions =

            final ArrayList<SuggestedWords.SuggestedWordInfo> typedWordAndPreviousSuggestions =

                    SuggestedWords.getTypedWordAndPreviousSuggestions(typedWord, oldSuggestedWords);

                    SuggestedWords.getTypedWordAndPreviousSuggestions(typedWord, oldSuggestedWords);

            return new SuggestedWords(typedWordAndPreviousSuggestions, null /* rawSuggestions */,

            return new SuggestedWords(typedWordAndPreviousSuggestions, null /* rawSuggestions */,