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

Commit 2c5cf744 authored by Jean Chalard's avatar Jean Chalard
Browse files

Increase encapsulation (A118) 

showSuggestions is only ever called by updateSuggestionsOrPredictions.
It only feels natural that, when called with a 0-sized or null
suggestion list, it clears the suggestions.

Change-Id: I5b52bc9151afca1bb6c6f0a7f81e3255add92177
parent 1343d27d

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

+6 −6
Original line number Diff line number Diff line
@@ -1668,6 +1668,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
        }

    }



    // TODO: rename this method to updateSuggestionStrip or simply updateSuggestions

    private void updateSuggestionsOrPredictions() {

        mHandler.cancelUpdateSuggestionStrip();
@@ -1699,11 +1700,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
                mCurrentSettings.mCorrectionEnabled);

        suggestedWords = maybeRetrieveOlderSuggestions(typedWord, suggestedWords);



        if (null != suggestedWords && suggestedWords.size() > 0) {

        showSuggestions(suggestedWords, typedWord);

        } else {

            clearSuggestions();

        }

    }



    private SuggestedWords maybeRetrieveOlderSuggestions(final CharSequence typedWord,
@@ -1738,7 +1735,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 


    private void showSuggestions(final SuggestedWords suggestedWords,

            final CharSequence typedWord) {

        // This method is only ever called by updateSuggestions or updateBigramPredictions.

        if (null == suggestedWords || suggestedWords.size() <= 0) {

            clearSuggestions();

            return;

        }

        final CharSequence autoCorrection;

        if (suggestedWords.size() > 0) {

            if (suggestedWords.mWillAutoCorrect) {