diff options
6 files changed, 19 insertions, 19 deletions
diff --git a/core/java/android/window/flags/accessibility.aconfig b/core/java/android/window/flags/accessibility.aconfig index 90b54bd76a60..871d34cfb800 100644 --- a/core/java/android/window/flags/accessibility.aconfig +++ b/core/java/android/window/flags/accessibility.aconfig @@ -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" diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 880a68776055..fb0b113a342b 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -3532,7 +3532,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); 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 0d5fd1435ca0..20bec59445c3 100644 --- a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java +++ b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java @@ -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); } diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java index 418998870f16..e663f4e1020a 100644 --- a/services/core/java/com/android/server/wm/AccessibilityController.java +++ b/services/core/java/com/android/server/wm/AccessibilityController.java @@ -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(); } } @@ -1018,14 +1018,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); @@ -1084,7 +1084,7 @@ final class AccessibilityController { } void dump(PrintWriter pw, String prefix) { - if (!Flags.magnificationAlwaysDrawFullscreenBorder()) { + if (!Flags.alwaysDrawMagnificationFullscreenBorder()) { mMagnifiedViewport.dump(pw, prefix); } } @@ -1190,7 +1190,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"; @@ -1495,7 +1495,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; @@ -1524,7 +1524,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(); diff --git a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationControllerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationControllerTest.java index 1a51c45e2ef6..58567ca2380f 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationControllerTest.java @@ -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( diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java index 48b12f729e08..e37da2040850 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java @@ -1115,7 +1115,7 @@ public class WindowManagerServiceTests extends WindowTestsBase { argThat(h -> (h.inputConfig & InputConfig.SPY) == InputConfig.SPY)); } - @RequiresFlagsDisabled(Flags.FLAG_MAGNIFICATION_ALWAYS_DRAW_FULLSCREEN_BORDER) + @RequiresFlagsDisabled(Flags.FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER) @Test public void testDrawMagnifiedViewport() { final int displayId = mDisplayContent.mDisplayId; |