diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 50aec835cc31b..ecdf0900e2cd7 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -3711,6 +3711,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 218bbc24bbe60..f48729f7f515b 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -4528,6 +4528,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 7ee72dfa30fde..5513d6a7c00ea 100644
--- a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java
+++ b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java
@@ -152,7 +152,7 @@ public class MagnificationController implements WindowMagnificationManager.Callb
mSupportWindowMagnification = context.getPackageManager().hasSystemFeature(
FEATURE_WINDOW_MAGNIFICATION);
- mAlwaysOnMagnificationFeatureFlag = new AlwaysOnMagnificationFeatureFlag();
+ mAlwaysOnMagnificationFeatureFlag = new AlwaysOnMagnificationFeatureFlag(context);
mAlwaysOnMagnificationFeatureFlag.addOnChangedListener(
ConcurrentUtils.DIRECT_EXECUTOR, mAms::updateAlwaysOnMagnification);
}