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

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

Merge "Move a settings var to the settings class"

parents 2a659b8a d567b230

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

+1 −2
Original line number Diff line number Diff line
@@ -1080,8 +1080,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 


    @Override

    public boolean onEvaluateFullscreenMode() {

        return super.onEvaluateFullscreenMode()

                && mResources.getBoolean(R.bool.config_use_fullscreen_mode);

        return super.onEvaluateFullscreenMode() && mSettingsValues.mUseFullScreenMode;

    }



    @Override

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

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ public class SettingsValues { 
    private final String mSymbolsExcludedFromWordSeparators;

    public final String mWordSeparators;

    public final CharSequence mHintToSaveText;

    public final boolean mUseFullScreenMode;



    // From preferences, in the same order as xml/prefs.xml:

    public final boolean mAutoCap;
@@ -94,6 +95,7 @@ public class SettingsValues { 
        mWordSeparators = createWordSeparators(mMagicSpaceStrippers, mMagicSpaceSwappers,

                mSymbolsExcludedFromWordSeparators, res);

        mHintToSaveText = context.getText(R.string.hint_add_to_dictionary);

        mUseFullScreenMode = res.getBoolean(R.bool.config_use_fullscreen_mode);



        // Get the settings preferences

        mAutoCap = prefs.getBoolean(Settings.PREF_AUTO_CAP, true);