From 0aa67ede68d72d3ce9d2608e16eee207212221f7 Mon Sep 17 00:00:00 2001 From: Roy Chou Date: Fri, 12 May 2023 03:32:34 +0000 Subject: [PATCH] chore(#AlwaysOnMagnification): hardcode the feature flag default true Set the feature flag getter default return value to be true to rollout to public. We keep the checking code so that it's still remote controllable. Bug: 281788002 Test: manually test with adb command Change-Id: Ie7f32721cf99d8a97c11f0f9c6d0d466c083d668 --- ...oggleScreenMagnificationPreferenceFragment.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java index 201172575ed..12706712427 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java @@ -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; }