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

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

Merge "Some code simplification"

parents 03bcc5fa def4551c

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

+6 −6
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.util.Log; 


import com.android.inputmethod.keyboard.Keyboard;

import com.android.inputmethod.keyboard.ProximityInfo;

import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;



import java.io.File;

import java.util.ArrayList;
@@ -392,15 +393,15 @@ public class Suggest implements Dictionary.WordCallback { 
        mSuggestions.add(0, typedWord);

        StringUtils.removeDupes(mSuggestions);



        final ArrayList<SuggestedWords.SuggestedWordInfo> suggestionsList;

        final ArrayList<SuggestedWordInfo> suggestionsList;

        if (DBG) {

            // TODO: this doesn't take into account the fact that removing dupes from mSuggestions

            // may have made mScores[] and mSuggestions out of sync.

            final CharSequence autoCorrectionSuggestion = mSuggestions.get(0);

            double normalizedScore = BinaryDictionary.calcNormalizedScore(

                    typedWord, autoCorrectionSuggestion.toString(), mScores[0]);

            suggestionsList = new ArrayList<SuggestedWords.SuggestedWordInfo>();

            suggestionsList.add(new SuggestedWords.SuggestedWordInfo(autoCorrectionSuggestion, "+",

            suggestionsList = new ArrayList<SuggestedWordInfo>();

            suggestionsList.add(new SuggestedWordInfo(autoCorrectionSuggestion, "+",

                    false));

            final int suggestionsSize = mSuggestions.size();

            // Note: i here is the index in mScores[], but the index in mSuggestions is one more
@@ -413,12 +414,11 @@ public class Suggest implements Dictionary.WordCallback { 
                } else {

                    scoreInfoString = Integer.toString(mScores[i]);

                }

                suggestionsList.add(new SuggestedWords.SuggestedWordInfo(mSuggestions.get(i + 1),

                suggestionsList.add(new SuggestedWordInfo(mSuggestions.get(i + 1),

                        scoreInfoString, false));

            }

            for (int i = mScores.length; i < suggestionsSize; ++i) {

                suggestionsList.add(new SuggestedWords.SuggestedWordInfo(mSuggestions.get(i),

                        "--", false));

                suggestionsList.add(new SuggestedWordInfo(mSuggestions.get(i), "--", false));

            }

        } else {

            suggestionsList = SuggestedWords.getFromCharSequenceList(mSuggestions);