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

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

Remove a useless parameter 

Change-Id: I03005240238fb004c20b2df0d836796e2e8b307f
parent bdf6d1b1

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

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

                    false /* typedWordValid */,

                    false /* hasAutoCorrectionCandidate */,

                    false /* hasAutoCorrectionCandidate */,

                    false /* allowsToBeAutoCorrected */,

                    false /* allowsToBeAutoCorrected */,

                    false /* isPunctuationSuggestions */,

                    false /* isPunctuationSuggestions */);

                    false /* shouldBlockAutoCorrectionBySafetyNet */);

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

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

            final boolean isAutoCorrection = false;

            final boolean isAutoCorrection = false;

            setSuggestions(suggestedWords, isAutoCorrection);

            setSuggestions(suggestedWords, isAutoCorrection);
@@ -1794,8 +1793,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
                            false /* typedWordValid */,

                            false /* typedWordValid */,

                            false /* hasAutoCorrectionCandidate */,

                            false /* hasAutoCorrectionCandidate */,

                            false /* allowsToBeAutoCorrected */,

                            false /* allowsToBeAutoCorrected */,

                            false /* isPunctuationSuggestions */,

                            false /* isPunctuationSuggestions */);

                            false /* shouldBlockAutoCorrectionBySafetyNet */);

            showSuggestions(obsoleteSuggestedWords, typedWord);

            showSuggestions(obsoleteSuggestedWords, typedWord);

        }

        }

    }

    }

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

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

                false /* typedWordValid */,

                false /* hasAutoCorrectionCandidate */,

                false /* hasAutoCorrectionCandidate */,

                false /* allowsToBeAutoCorrected */,

                false /* allowsToBeAutoCorrected */,

                true /* isPunctuationSuggestions */,

                true /* isPunctuationSuggestions */);

                false /* shouldBlockAutoCorrectionBySafetyNet */);

    }

    }





    private static SuggestedWords createSuggestPuncOutputTextList(final String[] puncs) {

    private static SuggestedWords createSuggestPuncOutputTextList(final String[] puncs) {
@@ -209,8 +208,7 @@ public class SettingsValues { 
                false /* typedWordValid */,

                false /* typedWordValid */,

                false /* hasAutoCorrectionCandidate */,

                false /* hasAutoCorrectionCandidate */,

                false /* allowsToBeAutoCorrected */,

                false /* allowsToBeAutoCorrected */,

                true /* isPunctuationSuggestions */,

                true /* isPunctuationSuggestions */);

                false /* shouldBlockAutoCorrectionBySafetyNet */);

    }

    }





    private static String createWordSeparators(final String weakSpaceStrippers,

    private static String createWordSeparators(final String weakSpaceStrippers,

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

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

                false /* typedWordValid */,

                false /* hasAutoCorrectionCandidate */,

                false /* hasAutoCorrectionCandidate */,

                false /* allowsToBeAutoCorrected */,

                false /* allowsToBeAutoCorrected */,

                false /* isPunctuationSuggestions */,

                false /* isPunctuationSuggestions */);

                false /* shouldBlockAutoCorrectionBySafetyNet */);

    }

    }





    // TODO: cleanup dictionaries looking up and suggestions building with SuggestedWords.Builder

    // TODO: cleanup dictionaries looking up and suggestions building with SuggestedWords.Builder
@@ -446,10 +445,10 @@ public class Suggest implements Dictionary.WordCallback { 
        }

        }

        return new SuggestedWords(scoreInfoList,

        return new SuggestedWords(scoreInfoList,

                !allowsToBeAutoCorrected /* typedWordValid */,

                !allowsToBeAutoCorrected /* typedWordValid */,

                autoCorrectionAvailable /* hasAutoCorrectionCandidate */,

                autoCorrectionAvailable & !shouldBlockAutoCorrectionBySatefyNet

                        /* hasAutoCorrectionCandidate */,

                allowsToBeAutoCorrected /* allowsToBeAutoCorrected */,

                allowsToBeAutoCorrected /* allowsToBeAutoCorrected */,

                false /* isPunctuationSuggestions */,

                false /* isPunctuationSuggestions */);

                shouldBlockAutoCorrectionBySatefyNet);

    }

    }





    @Override

    @Override

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

+3 −5
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ import java.util.List; 




public class SuggestedWords {

public class SuggestedWords {

    public static final SuggestedWords EMPTY = new SuggestedWords(

    public static final SuggestedWords EMPTY = new SuggestedWords(

            Collections.<SuggestedWordInfo>emptyList(), false, false, false, false, false);

            Collections.<SuggestedWordInfo>emptyList(), false, false, false, false);





    public final boolean mTypedWordValid;

    public final boolean mTypedWordValid;

    public final boolean mHasAutoCorrectionCandidate;

    public final boolean mHasAutoCorrectionCandidate;
@@ -37,12 +37,10 @@ public class SuggestedWords { 
            final boolean typedWordValid,

            final boolean typedWordValid,

            final boolean hasAutoCorrectionCandidate,

            final boolean hasAutoCorrectionCandidate,

            final boolean allowsToBeAutoCorrected,

            final boolean allowsToBeAutoCorrected,

            final boolean isPunctuationSuggestions,

            final boolean isPunctuationSuggestions) {

            final boolean shouldBlockAutoCorrectionBySafetyNet) {

        mSuggestedWordInfoList = suggestedWordInfoList;

        mSuggestedWordInfoList = suggestedWordInfoList;

        mTypedWordValid = typedWordValid;

        mTypedWordValid = typedWordValid;

        mHasAutoCorrectionCandidate = hasAutoCorrectionCandidate

        mHasAutoCorrectionCandidate = hasAutoCorrectionCandidate;

                && !shouldBlockAutoCorrectionBySafetyNet;

        mAllowsToBeAutoCorrected = allowsToBeAutoCorrected;

        mAllowsToBeAutoCorrected = allowsToBeAutoCorrected;

        mIsPunctuationSuggestions = isPunctuationSuggestions;

        mIsPunctuationSuggestions = isPunctuationSuggestions;

    }

    }