diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 8899785a85a00..00f8db0d9264a 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3718,6 +3718,10 @@ magnification settings and adjust the default magnification capability. --> true + + true + false diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 1e9e8ddbf63fe..b592dc027e244 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -4536,6 +4536,7 @@ + diff --git a/services/accessibility/java/com/android/server/accessibility/magnification/AlwaysOnMagnificationFeatureFlag.java b/services/accessibility/java/com/android/server/accessibility/magnification/AlwaysOnMagnificationFeatureFlag.java index 93531ddea005b..92fd419885f1f 100644 --- a/services/accessibility/java/com/android/server/accessibility/magnification/AlwaysOnMagnificationFeatureFlag.java +++ b/services/accessibility/java/com/android/server/accessibility/magnification/AlwaysOnMagnificationFeatureFlag.java @@ -16,6 +16,8 @@ package com.android.server.accessibility.magnification; +import android.annotation.NonNull; +import android.content.Context; import android.provider.DeviceConfig; /** @@ -29,6 +31,13 @@ public class AlwaysOnMagnificationFeatureFlag extends MagnificationFeatureFlagBa private static final String FEATURE_NAME_ENABLE_ALWAYS_ON_MAGNIFICATION = "AlwaysOnMagnifier__enable_always_on_magnifier"; + private @NonNull Context mContext; + + AlwaysOnMagnificationFeatureFlag(@NonNull Context context) { + super(); + mContext = context; + } + @Override String getNamespace() { return NAMESPACE; @@ -41,6 +50,7 @@ public class AlwaysOnMagnificationFeatureFlag extends MagnificationFeatureFlagBa @Override boolean getDefaultValue() { - return false; + return mContext.getResources().getBoolean( + com.android.internal.R.bool.config_magnification_always_on_enabled); } } diff --git a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java index 9b1c20431b1ac..87fbee71ab597 100644 --- a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java +++ b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java @@ -156,7 +156,7 @@ public class MagnificationController implements WindowMagnificationManager.Callb mSupportWindowMagnification = context.getPackageManager().hasSystemFeature( FEATURE_WINDOW_MAGNIFICATION); - mAlwaysOnMagnificationFeatureFlag = new AlwaysOnMagnificationFeatureFlag(); + mAlwaysOnMagnificationFeatureFlag = new AlwaysOnMagnificationFeatureFlag(context); mAlwaysOnMagnificationFeatureFlag.addOnChangedListener( mBackgroundExecutor, mAms::updateAlwaysOnMagnification); }