Merge "fix(magnification): Rename flag for the fullscreen orange border" into main (4d0c1052) · Commits · e / os / android_frameworks_base

core/java/android/window/flags/accessibility.aconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ flag {
		}

		flag {
		name: "magnification_always_draw_fullscreen_border"
		name: "always_draw_magnification_fullscreen_border"
		namespace: "accessibility"
		description: "Always draw fullscreen orange border in fullscreen magnification"
		bug: "291891390"

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -3550,7 +3550,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
		&& userState.isMagnificationTwoFingerTripleTapEnabledLocked()));

		final boolean createConnectionForCurrentCapability =
		com.android.window.flags.Flags.magnificationAlwaysDrawFullscreenBorder()
		com.android.window.flags.Flags.alwaysDrawMagnificationFullscreenBorder()
		\|\| (userState.getMagnificationCapabilitiesLocked()
		!= Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -587,7 +587,7 @@ public class MagnificationController implements MagnificationConnectionManager.C

		@Override
		public void onFullScreenMagnificationActivationState(int displayId, boolean activated) {
		if (Flags.magnificationAlwaysDrawFullscreenBorder()) {
		if (Flags.alwaysDrawMagnificationFullscreenBorder()) {
		getMagnificationConnectionManager()
		.onFullscreenMagnificationActivationChanged(displayId, activated);
		}

services/core/java/com/android/server/wm/AccessibilityController.java

+13 −13

Original line number	Diff line number	Diff line
		@@ -463,7 +463,7 @@ final class AccessibilityController {
		}

		void drawMagnifiedRegionBorderIfNeeded(int displayId) {
		if (Flags.magnificationAlwaysDrawFullscreenBorder()) {
		if (Flags.alwaysDrawMagnificationFullscreenBorder()) {
		return;
		}

		@@ -653,7 +653,7 @@ final class AccessibilityController {
		mDisplayContent = displayContent;
		mDisplay = display;
		mHandler = new MyHandler(mService.mH.getLooper());
		mMagnifiedViewport = Flags.magnificationAlwaysDrawFullscreenBorder()
		mMagnifiedViewport = Flags.alwaysDrawMagnificationFullscreenBorder()
		? null : new MagnifiedViewport();
		mAccessibilityTracing =
		AccessibilityController.getAccessibilityControllerInternal(mService);
		@@ -697,7 +697,7 @@ final class AccessibilityController {
		mMagnificationSpec.clear();
		}

		if (!Flags.magnificationAlwaysDrawFullscreenBorder()) {
		if (!Flags.alwaysDrawMagnificationFullscreenBorder()) {
		mMagnifiedViewport.setShowMagnifiedBorderIfNeeded();
		}
		}
		@@ -708,7 +708,7 @@ final class AccessibilityController {
		FLAGS_MAGNIFICATION_CALLBACK, "activated=" + activated);
		}
		mIsFullscreenMagnificationActivated = activated;
		if (!Flags.magnificationAlwaysDrawFullscreenBorder()) {
		if (!Flags.alwaysDrawMagnificationFullscreenBorder()) {
		mMagnifiedViewport.setMagnifiedRegionBorderShown(activated, true);
		mMagnifiedViewport.showMagnificationBoundsIfNeeded();
		}
		@@ -746,7 +746,7 @@ final class AccessibilityController {
		}

		recomputeBounds();
		if (!Flags.magnificationAlwaysDrawFullscreenBorder()) {
		if (!Flags.alwaysDrawMagnificationFullscreenBorder()) {
		mMagnifiedViewport.onDisplaySizeChanged();
		}
		mHandler.sendEmptyMessage(MyHandler.MESSAGE_NOTIFY_DISPLAY_SIZE_CHANGED);
		@@ -908,7 +908,7 @@ final class AccessibilityController {
		mAccessibilityTracing.logTrace(LOG_TAG + ".destroy", FLAGS_MAGNIFICATION_CALLBACK);
		}

		if (!Flags.magnificationAlwaysDrawFullscreenBorder()) {
		if (!Flags.alwaysDrawMagnificationFullscreenBorder()) {
		mMagnifiedViewport.destroyWindow();
		}
		}
		@@ -919,7 +919,7 @@ final class AccessibilityController {
		FLAGS_MAGNIFICATION_CALLBACK);
		}

		if (!Flags.magnificationAlwaysDrawFullscreenBorder()) {
		if (!Flags.alwaysDrawMagnificationFullscreenBorder()) {
		mMagnifiedViewport.drawWindowIfNeeded();
		}
		}
		@@ -1039,14 +1039,14 @@ final class AccessibilityController {
		}
		visibleWindows.clear();

		if (!Flags.magnificationAlwaysDrawFullscreenBorder()) {
		if (!Flags.alwaysDrawMagnificationFullscreenBorder()) {
		mMagnifiedViewport.intersectWithDrawBorderInset(screenWidth, screenHeight);
		}

		final boolean magnifiedChanged =
		!mOldMagnificationRegion.equals(mMagnificationRegion);
		if (magnifiedChanged) {
		if (!Flags.magnificationAlwaysDrawFullscreenBorder()) {
		if (!Flags.alwaysDrawMagnificationFullscreenBorder()) {
		mMagnifiedViewport.updateBorderDrawingStatus(screenWidth, screenHeight);
		}
		mOldMagnificationRegion.set(mMagnificationRegion);
		@@ -1129,7 +1129,7 @@ final class AccessibilityController {
		}

		void dump(PrintWriter pw, String prefix) {
		if (!Flags.magnificationAlwaysDrawFullscreenBorder()) {
		if (!Flags.alwaysDrawMagnificationFullscreenBorder()) {
		mMagnifiedViewport.dump(pw, prefix);
		}
		}
		@@ -1235,7 +1235,7 @@ final class AccessibilityController {
		}

		// TODO(291891390): Remove this class when we clean up the flag
		// magnificationAlwaysDrawFullscreenBorder
		// alwaysDrawMagnificationFullscreenBorder
		private final class ViewportWindow implements Runnable {
		private static final String SURFACE_TITLE = "Magnification Overlay";

		@@ -1540,7 +1540,7 @@ final class AccessibilityController {
		public static final int MESSAGE_NOTIFY_DISPLAY_SIZE_CHANGED = 4;

		// TODO(291891390): Remove this field when we clean up the flag
		// magnificationAlwaysDrawFullscreenBorder
		// alwaysDrawMagnificationFullscreenBorder
		public static final int MESSAGE_SHOW_MAGNIFIED_REGION_BOUNDS_IF_NEEDED = 5;
		public static final int MESSAGE_NOTIFY_IME_WINDOW_VISIBILITY_CHANGED = 6;

		@@ -1569,7 +1569,7 @@ final class AccessibilityController {
		case MESSAGE_SHOW_MAGNIFIED_REGION_BOUNDS_IF_NEEDED : {
		synchronized (mService.mGlobalLock) {
		if (isFullscreenMagnificationActivated()) {
		if (!Flags.magnificationAlwaysDrawFullscreenBorder()) {
		if (!Flags.alwaysDrawMagnificationFullscreenBorder()) {
		mMagnifiedViewport.setMagnifiedRegionBorderShown(true, true);
		}
		mService.scheduleAnimationLocked();

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1272,7 +1272,7 @@ public class MagnificationControllerTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_MAGNIFICATION_ALWAYS_DRAW_FULLSCREEN_BORDER)
		@RequiresFlagsEnabled(Flags.FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER)
		public void onFullscreenMagnificationActivationState_systemUiBorderFlagOn_notifyConnection() {
		mMagnificationController.onFullScreenMagnificationActivationState(
		TEST_DISPLAY, /* activated= */ true);
		@@ -1282,7 +1282,7 @@ public class MagnificationControllerTest {
		}

		@Test
		@RequiresFlagsDisabled(Flags.FLAG_MAGNIFICATION_ALWAYS_DRAW_FULLSCREEN_BORDER)
		@RequiresFlagsDisabled(Flags.FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER)
		public void
		onFullscreenMagnificationActivationState_systemUiBorderFlagOff_neverNotifyConnection() {
		mMagnificationController.onFullScreenMagnificationActivationState(