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

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

Merge "Accept a null input attributes for reading settings."

parents f4bc4412 01e3b014

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

+0 −2
Original line number Diff line number Diff line
@@ -400,8 +400,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
        final Resources res = getResources();

        mResources = res;



        // TODO: remove the following when it's not needed by updateCorrectionMode() any more

        mInputAttributes = new InputAttributes(null, false /* isFullscreenMode */);

        loadSettings();



        ImfUtils.setAdditionalInputMethodSubtypes(this, mSettingsValues.getAdditionalSubtypes());

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

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ public class SettingsValues { 


    private int createCorrectionMode(final InputAttributes inputAttributes) {

        final boolean shouldAutoCorrect = mAutoCorrectEnabled

                && !inputAttributes.mInputTypeNoAutoCorrect;

                && (null == inputAttributes || !inputAttributes.mInputTypeNoAutoCorrect);

        if (mBigramSuggestionEnabled && shouldAutoCorrect) return Suggest.CORRECTION_FULL_BIGRAM;

        return shouldAutoCorrect ? Suggest.CORRECTION_FULL : Suggest.CORRECTION_NONE;

    }