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

Commit 9751a626 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Don't cache resource value that depends on orientation

Bug: 5794655
Change-Id: Ib324366c772e20bb54aba63c2f4540dc0f9de515
parent c88026e1
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -1019,7 +1019,10 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar

    @Override
    public boolean onEvaluateFullscreenMode() {
        return super.onEvaluateFullscreenMode() && mSettingsValues.mUseFullScreenMode;
        // Reread resource value here, because this method is called by framework anytime as needed.
        final boolean isFullscreenModeAllowed =
                mSettingsValues.isFullscreenModeAllowed(getResources());
        return super.onEvaluateFullscreenMode() && isFullscreenModeAllowed;
    }

    @Override
+4 −2
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 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;
@@ -107,7 +106,6 @@ 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);
@@ -294,6 +292,10 @@ public class SettingsValues {
        return mVoiceKeyOnMain;
    }

    public boolean isFullscreenModeAllowed(Resources res) {
        return res.getBoolean(R.bool.config_use_fullscreen_mode);
    }

    // Accessed from the settings interface, hence public
    public static float getCurrentKeypressSoundVolume(final SharedPreferences sp,
                final Resources res) {