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

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

Change-Id: I4b6f189fb36ca1158bea5a62616a580507bf46db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Roy Chou
2023-05-12 17:24:14 +00:00
committed by Automerger Merge Worker

View File

@@ -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;
}