Merge "Remove magnification_enlarge_pointer_bugfix flag." into main (97a20098) · Commits · e / os / android_frameworks_base

services/accessibility/accessibility.aconfig

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -206,16 +206,6 @@ flag {
	}		}
	}		}

	flag {
	name: "magnification_enlarge_pointer_bugfix"
	namespace: "accessibility"
	description: "When fullscreen magnification is enabled, pointer icon is enlarged"
	bug: "355734856"
	metadata {
	purpose: PURPOSE_BUGFIX
	}
	}

	flag {		flag {
	name: "manager_avoid_receiver_timeout"		name: "manager_avoid_receiver_timeout"
	namespace: "accessibility"		namespace: "accessibility"

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

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1812,11 +1812,9 @@ public class FullScreenMagnificationController implements
	* @param scale The new scale factor.		* @param scale The new scale factor.
	*/		*/
	public void notifyScaleForInput(int displayId, float scale) {		public void notifyScaleForInput(int displayId, float scale) {
	if (Flags.magnificationEnlargePointerBugfix()) {
	mControllerCtx.getInputManager()		mControllerCtx.getInputManager()
	.setAccessibilityPointerIconScaleFactor(displayId, scale);		.setAccessibilityPointerIconScaleFactor(displayId, scale);
	}		}
	}

	/**		/**
	* Resets all displays' magnification if last magnifying service is disabled.		* Resets all displays' magnification if last magnifying service is disabled.

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

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,6 @@ package com.android.server.accessibility.magnification;

	import static android.accessibilityservice.MagnificationConfig.MAGNIFICATION_MODE_FULLSCREEN;		import static android.accessibilityservice.MagnificationConfig.MAGNIFICATION_MODE_FULLSCREEN;

	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.FullScreenMagnificationController.MagnificationInfoChangedCallback;
	import static com.android.server.accessibility.magnification.MockMagnificationConnection.TEST_DISPLAY;		import static com.android.server.accessibility.magnification.MockMagnificationConnection.TEST_DISPLAY;

	@@ -1688,7 +1687,6 @@ public class FullScreenMagnificationControllerTest {
	}		}

	@Test		@Test
	@RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)
	public void persistScale_setValue_notifyInput() {		public void persistScale_setValue_notifyInput() {
	register(TEST_DISPLAY);		register(TEST_DISPLAY);

	@@ -1708,7 +1706,6 @@ public class FullScreenMagnificationControllerTest {
	}		}

	@Test		@Test
	@RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)
	public void setScale_setNonTransientScale_notifyInput() {		public void setScale_setNonTransientScale_notifyInput() {
	register(TEST_DISPLAY);		register(TEST_DISPLAY);

	@@ -1720,7 +1717,6 @@ public class FullScreenMagnificationControllerTest {
	}		}

	@Test		@Test
	@RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)
	public void setScaleAndCenter_setTransientScale_notNotifyInput() {		public void setScaleAndCenter_setTransientScale_notNotifyInput() {
	register(TEST_DISPLAY);		register(TEST_DISPLAY);

	@@ -1735,7 +1731,6 @@ public class FullScreenMagnificationControllerTest {
	}		}

	@Test		@Test
	@RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)
	public void setScaleAndCenter_setNonTransientScale_notifyInput() {		public void setScaleAndCenter_setNonTransientScale_notifyInput() {
	register(TEST_DISPLAY);		register(TEST_DISPLAY);

	@@ -1747,7 +1742,6 @@ public class FullScreenMagnificationControllerTest {
	}		}

	@Test		@Test
	@RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)
	public void setCenter_notNotifyInput() {		public void setCenter_notNotifyInput() {
	register(TEST_DISPLAY);		register(TEST_DISPLAY);

	@@ -1765,7 +1759,6 @@ public class FullScreenMagnificationControllerTest {
	}		}

	@Test		@Test
	@RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)
	public void offsetMagnifiedRegion_notNotifyInput() {		public void offsetMagnifiedRegion_notNotifyInput() {
	register(TEST_DISPLAY);		register(TEST_DISPLAY);