commit 7490b43a898fc99048980cd84802f176d044c014
author Hiroki Sato <hirokisato@google.com> Wed Oct 23 14:37:28 2024 +0900
committer Hiroki Sato <hirokisato@google.com> Wed Oct 23 07:56:14 2024 +0000
tree fdac7c781dc460fec34b029f9ad22100af1c87b0
parent 8ae058d111b3c9023841c70a963a9fea9390bde8

Move magnification_enlarge_pointer aconfig to bugfix flag

This is now rolled out as a bugfix.

Bug: 355734856
Test: atest com.android.server.accessibility.magnification (with/without flag enabled)
Flag: com.android.server.accessibility.magnification_enlarge_pointer_bugfix

Change-Id: Ia08e3192577e991acda9a1293fe40a39b2f32f70

services/accessibility/accessibility.aconfig

diff --git a/services/accessibility/accessibility.aconfig b/services/accessibility/accessibility.aconfig
index cb4e994..2808056 100644
--- a/services/accessibility/accessibility.aconfig
+++ b/services/accessibility/accessibility.aconfig
@@ -175,10 +175,13 @@
 }
 
 flag {
-    name: "magnification_enlarge_pointer"
+    name: "magnification_enlarge_pointer_bugfix"
     namespace: "accessibility"
     description: "When fullscreen magnification is enabled, pointer icon is enlarged"
     bug: "355734856"
+    metadata {
+        purpose: PURPOSE_BUGFIX
+    }
 }
 
 flag {

services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationController.java

diff --git a/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationController.java b/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationController.java
index ce1a292..d3d80e1 100644
--- a/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationController.java
+++ b/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationController.java
@@ -1759,7 +1759,7 @@
      * @param scale     The new scale factor.
      */
     public void notifyScaleForInput(int displayId, float scale) {
-        if (Flags.magnificationEnlargePointer()) {
+        if (Flags.magnificationEnlargePointerBugfix()) {
             mControllerCtx.getInputManager()
                     .setAccessibilityPointerIconScaleFactor(displayId, scale);
         }

services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationControllerTest.java

diff --git a/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationControllerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationControllerTest.java
index 5985abc..7e0c12a 100644
--- a/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationControllerTest.java
+++ b/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationControllerTest.java
@@ -18,7 +18,7 @@
 
 import static android.accessibilityservice.MagnificationConfig.MAGNIFICATION_MODE_FULLSCREEN;
 
-import static com.android.server.accessibility.Flags.FLAG_MAGNIFICATION_ENLARGE_POINTER;
+import static com.android.server.accessibility.Flags.FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX;
 import static com.android.server.accessibility.magnification.FullScreenMagnificationController.MagnificationInfoChangedCallback;
 import static com.android.server.accessibility.magnification.MockMagnificationConnection.TEST_DISPLAY;
 import static com.android.window.flags.Flags.FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER;
@@ -1484,7 +1484,7 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER)
+    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)
     public void persistScale_setValue_notifyInput() {
         register(TEST_DISPLAY);
 
@@ -1504,7 +1504,7 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER)
+    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)
     public void setScale_setNonTransientScale_notifyInput() {
         register(TEST_DISPLAY);
 
@@ -1516,7 +1516,7 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER)
+    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)
     public void setScaleAndCenter_setTransientScale_notNotifyInput() {
         register(TEST_DISPLAY);
 
@@ -1531,7 +1531,7 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER)
+    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)
     public void setScaleAndCenter_setNonTransientScale_notifyInput() {
         register(TEST_DISPLAY);
 
@@ -1543,7 +1543,7 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER)
+    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)
     public void setCenter_notNotifyInput() {
         register(TEST_DISPLAY);
 
@@ -1561,7 +1561,7 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER)
+    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)
     public void offsetMagnifiedRegion_notNotifyInput() {
         register(TEST_DISPLAY);