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

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

Make the Builder fully immutable at last 

Change-Id: Ie399ca7a9e76ccab44a92bc378d11f92392fed2c
parent 6ffb5018

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

+4 −2
Original line number Diff line number Diff line
@@ -930,7 +930,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
                    false /* typedWordValid */,

                    false /* hasMinimalSuggestion */,

                    false /* allowsToBeAutoCorrected */,

                    false /* isPunctuationSuggestions */);

                    false /* isPunctuationSuggestions */,

                    false /* shouldBlockAutoCorrectionBySafetyNet */);

            // When in fullscreen mode, show completions generated by the application

            final SuggestedWords words = builder.build();

            final boolean isAutoCorrection = false;
@@ -1794,7 +1795,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
                            false /* typedWordValid */,

                            false /* hasMinimalSuggestion */,

                            false /* allowsToBeAutoCorrected */,

                            false /* isPunctuationSuggestions */);

                            false /* isPunctuationSuggestions */,

                            false /* shouldBlockAutoCorrectionBySafetyNet */);

            showSuggestions(obsoleteSuggestionsBuilder.build(), typedWord);

        }

    }

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

+4 −2
Original line number Diff line number Diff line
@@ -187,7 +187,8 @@ public class SettingsValues { 
                false /* typedWordValid */,

                false /* hasMinimalSuggestion */,

                false /* allowsToBeAutoCorrected */,

                true /* isPunctuationSuggestions */);

                true /* isPunctuationSuggestions */,

                false /* shouldBlockAutoCorrectionBySafetyNet */);

        return builder.build();

    }
@@ -209,7 +210,8 @@ public class SettingsValues { 
                false /* typedWordValid */,

                false /* hasMinimalSuggestion */,

                false /* allowsToBeAutoCorrected */,

                true /* isPunctuationSuggestions */);

                true /* isPunctuationSuggestions */,

                false /* shouldBlockAutoCorrectionBySafetyNet */);

        return builder.build();

    }

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

+4 −5
Original line number Diff line number Diff line
@@ -274,7 +274,8 @@ public class Suggest implements Dictionary.WordCallback { 
                false /* typedWordValid */,

                false /* hasMinimalSuggestion */,

                false /* allowsToBeAutoCorrected */,

                false /* isPunctuationSuggestions */);

                false /* isPunctuationSuggestions */,

                false /* shouldBlockAutoCorrectionBySafetyNet */);

    }



    // TODO: cleanup dictionaries looking up and suggestions building with SuggestedWords.Builder
@@ -449,10 +450,8 @@ public class Suggest implements Dictionary.WordCallback { 
                !allowsToBeAutoCorrected /* typedWordValid */,

                autoCorrectionAvailable /* hasMinimalSuggestion */,

                allowsToBeAutoCorrected /* allowsToBeAutoCorrected */,

                false /* isPunctuationSuggestions */);

        if (shouldBlockAutoCorrectionBySatefyNet) {

            builder.setShouldBlockAutoCorrectionBySafetyNet();

        }

                false /* isPunctuationSuggestions */,

                shouldBlockAutoCorrectionBySatefyNet);

        return builder;

    }

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

+4 −7
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public class SuggestedWords { 
        private final boolean mTypedWordValid;

        private final boolean mHasMinimalSuggestion;

        private final boolean mIsPunctuationSuggestions;

        private boolean mShouldBlockAutoCorrectionBySafetyNet;

        private final boolean mShouldBlockAutoCorrectionBySafetyNet;

        private final boolean mAllowsToBeAutoCorrected;

        private final List<SuggestedWordInfo> mSuggestedWordInfoList;
@@ -88,12 +88,14 @@ public class SuggestedWords { 
                final boolean typedWordValid,

                final boolean hasMinimalSuggestion,

                final boolean allowsToBeAutoCorrected,

                final boolean isPunctuationSuggestions) {

                final boolean isPunctuationSuggestions,

                final boolean shouldBlockAutoCorrectionBySafetyNet) {

            mSuggestedWordInfoList = suggestedWordInfoList;

            mTypedWordValid = typedWordValid;

            mHasMinimalSuggestion = hasMinimalSuggestion;

            mAllowsToBeAutoCorrected = allowsToBeAutoCorrected;

            mIsPunctuationSuggestions = isPunctuationSuggestions;

            mShouldBlockAutoCorrectionBySafetyNet = shouldBlockAutoCorrectionBySafetyNet;

        }



        public static ArrayList<SuggestedWordInfo> getFromCharSequenceList(
@@ -114,11 +116,6 @@ public class SuggestedWords { 
            return result;

        }



        public Builder setShouldBlockAutoCorrectionBySafetyNet() {

            mShouldBlockAutoCorrectionBySafetyNet = true;

            return this;

        }



        // Should get rid of the first one (what the user typed previously) from suggestions

        // and replace it with what the user currently typed.

        public static ArrayList<SuggestedWordInfo> getTypedWordAndPreviousSuggestions(