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

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

Merge "Some renaming"

parents 0af449aa a83a53ba

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

+1 −1
Original line number Diff line number Diff line
@@ -1838,7 +1838,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
        final boolean shouldBlockAutoCorrectionBySafetyNet =

                Utils.shouldBlockAutoCorrectionBySafetyNet(suggestedWords, mSuggest);

        if (shouldBlockAutoCorrectionBySafetyNet) {

            suggestedWords.setShouldBlockAutoCorrection();

            suggestedWords.setShouldBlockAutoCorrectionBySatefyNet();

        }

        final CharSequence autoCorrection;

        if (suggestedWords.size() > 0) {

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

+6 −6
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ public class SuggestedWords { 
    public final boolean mHasAutoCorrectionCandidate;

    public final boolean mIsPunctuationSuggestions;

    private final List<SuggestedWordInfo> mSuggestedWordInfoList;

    private boolean mShouldBlockAutoCorrection;

    private boolean mShouldBlockAutoCorrectionBySafetyNet;



    private SuggestedWords(List<CharSequence> words, boolean typedWordValid,

            boolean hasAutoCorrectionCandidate, boolean isPunctuationSuggestions,
@@ -46,7 +46,7 @@ public class SuggestedWords { 
        mHasAutoCorrectionCandidate = hasAutoCorrectionCandidate;

        mIsPunctuationSuggestions = isPunctuationSuggestions;

        mSuggestedWordInfoList = suggestedWordInfoList;

        mShouldBlockAutoCorrection = false;

        mShouldBlockAutoCorrectionBySafetyNet = false;

    }



    public int size() {
@@ -69,12 +69,12 @@ public class SuggestedWords { 
        return mIsPunctuationSuggestions;

    }



    public void setShouldBlockAutoCorrection() {

        mShouldBlockAutoCorrection = true;

    public void setShouldBlockAutoCorrectionBySatefyNet() {

        mShouldBlockAutoCorrectionBySafetyNet = true;

    }



    public boolean shouldBlockAutoCorrection() {

        return mShouldBlockAutoCorrection;

    public boolean shouldBlockAutoCorrectionBySafetyNet() {

        return mShouldBlockAutoCorrectionBySafetyNet;

    }



    public static class Builder {

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

+1 −1
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ public class Utils { 


    public static boolean willAutoCorrect(SuggestedWords suggestions) {

        return !suggestions.mTypedWordValid && suggestions.mHasAutoCorrectionCandidate

                && !suggestions.shouldBlockAutoCorrection();

                && !suggestions.shouldBlockAutoCorrectionBySafetyNet();

    }



    public static class Stats {

java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener, 
            }

            if (LatinImeLogger.sDBG) {

                if (index == mCenterSuggestionIndex && suggestions.mHasAutoCorrectionCandidate

                        && suggestions.shouldBlockAutoCorrection()) {

                        && suggestions.shouldBlockAutoCorrectionBySafetyNet()) {

                    return 0xFFFF0000;

                }

            }