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

Commit e0c2e5b2 authored by Jean Chalard's avatar Jean Chalard Committed by Android (Google) Code Review
Browse files

Merge "Remove a deprecated constructor to SuggestedWords"

parents 72866677 c3e211bd

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

+5 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ public final class Suggest { 
            inputStyle = inputStyleIfNotPrediction;

        }

        callback.onGetSuggestedWords(new SuggestedWords(suggestionsList,

                suggestionResults.mRawSuggestions,

                suggestionResults.mRawSuggestions, typedWord,

                // TODO: this first argument is lying. If this is a whitelisted word which is an

                // actual word, it says typedWordValid = false, which looks wrong. We should either

                // rename the attribute or change the value.
@@ -286,8 +286,12 @@ public final class Suggest { 
        // (typedWordValid=true), not as an "auto correct word" (willAutoCorrect=false).

        // Note that because this method is never used to get predictions, there is no need to

        // modify inputType such in getSuggestedWordsForNonBatchInput.

        final String pseudoTypedWord = suggestionsContainer.isEmpty() ? null

                : suggestionsContainer.get(0).mWord;



        callback.onGetSuggestedWords(new SuggestedWords(suggestionsContainer,

                suggestionResults.mRawSuggestions,

                pseudoTypedWord,

                true /* typedWordValid */,

                false /* willAutoCorrect */,

                false /* isObsoleteSuggestions */,

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

+2 −12
Original line number Diff line number Diff line
@@ -73,21 +73,11 @@ public class SuggestedWords { 
            final boolean willAutoCorrect,

            final boolean isObsoleteSuggestions,

            final int inputStyle) {

        this(suggestedWordInfoList, rawSuggestions, typedWordValid, willAutoCorrect,

                isObsoleteSuggestions, inputStyle, NOT_A_SEQUENCE_NUMBER);

    }



    public SuggestedWords(final ArrayList<SuggestedWordInfo> suggestedWordInfoList,

            final ArrayList<SuggestedWordInfo> rawSuggestions,

            final boolean typedWordValid,

            final boolean willAutoCorrect,

            final boolean isObsoleteSuggestions,

            final int inputStyle,

            final int sequenceNumber) {

        this(suggestedWordInfoList, rawSuggestions,

                (suggestedWordInfoList.isEmpty() || isPrediction(inputStyle)) ? null

                        : suggestedWordInfoList.get(INDEX_OF_TYPED_WORD).mWord,

                typedWordValid, willAutoCorrect, isObsoleteSuggestions, inputStyle, sequenceNumber);

                typedWordValid, willAutoCorrect,

                isObsoleteSuggestions, inputStyle, NOT_A_SEQUENCE_NUMBER);

    }



    public SuggestedWords(final ArrayList<SuggestedWordInfo> suggestedWordInfoList,