summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/accessibility/accessibility.aconfig5
-rw-r--r--services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationController.java2
-rw-r--r--services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationControllerTest.java14
3 files changed, 12 insertions, 9 deletions
diff --git a/services/accessibility/accessibility.aconfig b/services/accessibility/accessibility.aconfig
index cb4e9949a8ff..2808056f72c9 100644
--- a/services/accessibility/accessibility.aconfig
+++ b/services/accessibility/accessibility.aconfig
@@ -175,10 +175,13 @@ flag {
}
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 {
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 ce1a292fb069..d3d80e12313f 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 @@ public class FullScreenMagnificationController implements
* @param scale The new scale factor.
*/
public void notifyScaleForInput(int displayId, float scale) {
- if (Flags.magnificationEnlargePointer()) {
+ if (Flags.magnificationEnlargePointerBugfix()) {
mControllerCtx.getInputManager()
.setAccessibilityPointerIconScaleFactor(displayId, scale);
}
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 5985abc344a2..7e0c12a5a545 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 @@ package com.android.server.accessibility.magnification;
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 @@ public class FullScreenMagnificationControllerTest {
}
@Test
- @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER)
+ @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)
public void persistScale_setValue_notifyInput() {
register(TEST_DISPLAY);
@@ -1504,7 +1504,7 @@ public class FullScreenMagnificationControllerTest {
}
@Test
- @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER)
+ @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)
public void setScale_setNonTransientScale_notifyInput() {
register(TEST_DISPLAY);
@@ -1516,7 +1516,7 @@ public class FullScreenMagnificationControllerTest {
}
@Test
- @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER)
+ @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)
public void setScaleAndCenter_setTransientScale_notNotifyInput() {
register(TEST_DISPLAY);
@@ -1531,7 +1531,7 @@ public class FullScreenMagnificationControllerTest {
}
@Test
- @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER)
+ @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)
public void setScaleAndCenter_setNonTransientScale_notifyInput() {
register(TEST_DISPLAY);
@@ -1543,7 +1543,7 @@ public class FullScreenMagnificationControllerTest {
}
@Test
- @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER)
+ @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)
public void setCenter_notNotifyInput() {
register(TEST_DISPLAY);
@@ -1561,7 +1561,7 @@ public class FullScreenMagnificationControllerTest {
}
@Test
- @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER)
+ @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)
public void offsetMagnifiedRegion_notNotifyInput() {
register(TEST_DISPLAY);