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

Commit e6a9655a authored by Kurt Partridge's avatar Kurt Partridge Committed by Android (Google) Code Review
Browse files

Merge "Consolidate SuggestedWords.getWordInfo and .getInfo"

parents 937877b8 b5ac8ef5

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

+1 −5
Original line number Diff line number Diff line
@@ -65,10 +65,6 @@ public final class SuggestedWords { 
        return mSuggestedWordInfoList.get(pos).mWord;

    }



    public SuggestedWordInfo getWordInfo(int pos) {

        return mSuggestedWordInfoList.get(pos);

    }



    public SuggestedWordInfo getInfo(int pos) {

        return mSuggestedWordInfoList.get(pos);

    }
@@ -113,7 +109,7 @@ public final class SuggestedWords { 
        alreadySeen.add(typedWord.toString());

        final int previousSize = previousSuggestions.size();

        for (int pos = 1; pos < previousSize; pos++) {

            final SuggestedWordInfo prevWordInfo = previousSuggestions.getWordInfo(pos);

            final SuggestedWordInfo prevWordInfo = previousSuggestions.getInfo(pos);

            final String prevWord = prevWordInfo.mWord;

            // Filter out duplicate suggestion.

            if (!alreadySeen.contains(prevWord)) {

java/src/com/android/inputmethod/research/JsonUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ import java.util.Map; 
        jsonWriter.beginArray();

        final int size = words.size();

        for (int j = 0; j < size; j++) {

            final SuggestedWordInfo wordInfo = words.getWordInfo(j);

            final SuggestedWordInfo wordInfo = words.getInfo(j);

            jsonWriter.value(wordInfo.toString());

        }

        jsonWriter.endArray();