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

Commit c60fea85 authored by Jean Chalard's avatar Jean Chalard
Browse files

Make the suggested word list final in Builder. 

Change-Id: I2ddfab00dc8c141fc989a051f16eb2b3571b7e86
parent 08adb09e

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

+3 −4
Original line number Diff line number Diff line
@@ -926,8 +926,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
            final List<SuggestedWords.SuggestedWordInfo> applicationSuggestedWords =

                    SuggestedWords.Builder.getFromApplicationSpecifiedCompletions(

                            applicationSpecifiedCompletions);

            SuggestedWords.Builder builder = new SuggestedWords.Builder()

                    .setWords(applicationSuggestedWords)

            SuggestedWords.Builder builder = new SuggestedWords.Builder(applicationSuggestedWords)

                    .setTypedWordValid(false)

                    .setHasMinimalSuggestion(false);

            // When in fullscreen mode, show completions generated by the application
@@ -1786,8 +1785,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
            final ArrayList<SuggestedWords.SuggestedWordInfo> typedWordAndPreviousSuggestions =

                    SuggestedWords.Builder.getTypedWordAndPreviousSuggestions(

                            typedWord, previousSuggestions);

            final SuggestedWords.Builder obsoleteSuggestionsBuilder = new SuggestedWords.Builder()

                    .setWords(typedWordAndPreviousSuggestions)

            final SuggestedWords.Builder obsoleteSuggestionsBuilder =

                    new SuggestedWords.Builder(typedWordAndPreviousSuggestions)

                    .setTypedWordValid(false)

                    .setHasMinimalSuggestion(false);

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

+2 −4
Original line number Diff line number Diff line
@@ -183,8 +183,7 @@ public class SettingsValues { 
                        KeySpecParser.getLabel(puncSpec)));

            }

        }

        final SuggestedWords.Builder builder = new SuggestedWords.Builder()

                .setWords(puncList)

        final SuggestedWords.Builder builder = new SuggestedWords.Builder(puncList)

                .setIsPunctuationSuggestions();

        return builder.build();

    }
@@ -203,8 +202,7 @@ public class SettingsValues { 
                }

            }

        }

        final SuggestedWords.Builder builder = new SuggestedWords.Builder()

                .setWords(puncOutputTextList)

        final SuggestedWords.Builder builder = new SuggestedWords.Builder(puncOutputTextList)

                .setIsPunctuationSuggestions();

        return builder.build();

    }

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

+5 −5
Original line number Diff line number Diff line
@@ -269,8 +269,8 @@ public class Suggest implements Dictionary.WordCallback { 


        StringUtils.removeDupes(mSuggestions);



        return new SuggestedWords.Builder()

                .setWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))

        return new SuggestedWords.Builder(

                SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))

                .setAllowsToBeAutoCorrected(false);

    }
@@ -423,11 +423,11 @@ public class Suggest implements Dictionary.WordCallback { 
                scoreInfoList.add(new SuggestedWords.SuggestedWordInfo(mSuggestions.get(i),

                        "--", false));

            }

            builder = new SuggestedWords.Builder().setWords(scoreInfoList)

            builder = new SuggestedWords.Builder(scoreInfoList)

                    .setAllowsToBeAutoCorrected(allowsToBeAutoCorrected);

        } else {

            builder = new SuggestedWords.Builder()

                    .setWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))

            builder = new SuggestedWords.Builder(

                    SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))

                    .setAllowsToBeAutoCorrected(allowsToBeAutoCorrected);

        }

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

+2 −9
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.inputmethod.latin;



import android.text.TextUtils;

import android.view.inputmethod.CompletionInfo;



import java.util.ArrayList;
@@ -79,16 +78,10 @@ public class SuggestedWords { 
        private boolean mIsPunctuationSuggestions;

        private boolean mShouldBlockAutoCorrectionBySafetyNet;

        private boolean mAllowsToBeAutoCorrected;

        private List<SuggestedWordInfo> mSuggestedWordInfoList =

                new ArrayList<SuggestedWordInfo>();



        public Builder() {

            // Nothing to do here.

        }

        private final List<SuggestedWordInfo> mSuggestedWordInfoList;



        public Builder setWords(List<SuggestedWordInfo> suggestedWordInfoList) {

        public Builder(final List<SuggestedWordInfo> suggestedWordInfoList) {

            mSuggestedWordInfoList = suggestedWordInfoList;

            return this;

        }



        public static List<SuggestedWordInfo> getFromCharSequenceList(