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

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

Merge "Do away with Utils#addAllSuggestions (A14)"

parents 6ff66f98 2225b3ba

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

+0 −2
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ public class BinaryDictionary extends Dictionary { 
                        mBigramScores[j], SuggestedWordInfo.KIND_CORRECTION));

            }

        }

        Utils.addAllSuggestions(mDicTypeId, Dictionary.BIGRAM, suggestions, callback);

        return suggestions;

    }
@@ -168,7 +167,6 @@ public class BinaryDictionary extends Dictionary { 
                        mScores[j], SuggestedWordInfo.KIND_CORRECTION));

            }

        }

        Utils.addAllSuggestions(mDicTypeId, Dictionary.UNIGRAM, suggestions, callback);

        return suggestions;

    }

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

+0 −2
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ public class ExpandableDictionary extends Dictionary { 
        }

        final ArrayList<SuggestedWordInfo> suggestions =

                getWordsInner(codes, prevWordForBigrams, proximityInfo);

        Utils.addAllSuggestions(mDicTypeId, Dictionary.UNIGRAM, suggestions, callback);

        return suggestions;

    }
@@ -618,7 +617,6 @@ public class ExpandableDictionary extends Dictionary { 
        if (!reloadDictionaryIfRequired()) {

            final ArrayList<SuggestedWordInfo> suggestions = new ArrayList<SuggestedWordInfo>();

            runBigramReverseLookUp(previousWord, suggestions);

            Utils.addAllSuggestions(mDicTypeId, Dictionary.BIGRAM, suggestions, callback);

            return suggestions;

        }

        return null;

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

+0 −10
Original line number Diff line number Diff line
@@ -531,14 +531,4 @@ public class Utils { 
        }

        return builder.toString();

    }



    public static void addAllSuggestions(final int dicTypeId, final int dataType,

            final ArrayList<SuggestedWords.SuggestedWordInfo> suggestions,

            final Dictionary.WordCallback callback) {

        for (SuggestedWordInfo suggestion : suggestions) {

            final String suggestionStr = suggestion.mWord.toString();

            callback.addWord(suggestionStr.toCharArray(), null, 0, suggestionStr.length(),

                    suggestion.mScore, dicTypeId, dataType);

        }

    }

}

java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java

+1 −1
Original line number Diff line number Diff line
@@ -792,7 +792,7 @@ public class AndroidSpellCheckerService extends SpellCheckerService 
                            composer, prevWord, suggestionsGatherer, dictInfo.mProximityInfo);

                    for (final SuggestedWordInfo suggestion : suggestions) {

                        final String suggestionStr = suggestion.mWord.toString();

                        suggestionsGatherer.oldAddWord(suggestionStr.toCharArray(), 0,

                        suggestionsGatherer.oldAddWord(suggestionStr.toCharArray(), null, 0,

                                suggestionStr.length(), suggestion.mScore, 0 /* ignored */,

                                Dictionary.UNIGRAM);

                    }