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

Commit f482ff63 authored by Roy Chou's avatar Roy Chou Committed by Automerger Merge Worker
Browse files

Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true"... 

Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev am: 412c248c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199816



Change-Id: I23d2fec9ab12741fd35ca1ff130e8ec8a97f58e8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 071db861 412c248c

src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java

+10 −4
Original line number Diff line number Diff line
@@ -249,12 +249,18 @@ public class ToggleScreenMagnificationPreferenceFragment extends 
        super.onProcessArguments(arguments);

    }



    private void addAlwaysOnSetting(PreferenceCategory generalCategory) {

        if (!DeviceConfig.getBoolean(

    private boolean isAlwaysOnSettingEnabled() {

        final boolean defaultValue = getContext().getResources().getBoolean(

                com.android.internal.R.bool.config_magnification_always_on_enabled);



        return DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_WINDOW_MANAGER,

                "AlwaysOnMagnifier__enable_always_on_magnifier",

                false

        )) {

                defaultValue

        );

    }

    private void addAlwaysOnSetting(PreferenceCategory generalCategory) {

        if (!isAlwaysOnSettingEnabled()) {

            return;

        }