Merge "Fix the flaky AccessibilityMagnificationTest#testListener" into tm-dev (840f3989) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -254,8 +254,8 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold

		mMirrorViewGeometryVsyncCallback =
		l -> {
		if (isWindowVisible() && mMirrorSurface != null) {
		calculateSourceBounds(mMagnificationFrame, mScale);
		if (isWindowVisible() && mMirrorSurface != null && calculateSourceBounds(
		mMagnificationFrame, mScale)) {
		// The final destination for the magnification surface should be at 0,0
		// since the ViewRootImpl's position will change
		mTmpRect.set(0, 0, mMagnificationFrame.width(),
		@@ -350,6 +350,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold
		mMirrorWindowControl.destroyControl();
		}
		mMirrorViewBounds.setEmpty();
		mSourceBounds.setEmpty();
		updateSystemUIStateIfNeeded();
		mContext.unregisterComponentCallbacks(this);
		}
		@@ -728,8 +729,12 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold
		/**
		* Calculates the desired source bounds. This will be the area under from the center of the
		* displayFrame, factoring in scale.
		*
		* @return {@code true} if the source bounds is changed.
		*/
		private void calculateSourceBounds(Rect displayFrame, float scale) {
		private boolean calculateSourceBounds(Rect displayFrame, float scale) {
		final Rect oldSourceBounds = mTmpRect;
		oldSourceBounds.set(mSourceBounds);
		int halfWidth = displayFrame.width() / 2;
		int halfHeight = displayFrame.height() / 2;
		int left = displayFrame.left + (halfWidth - (int) (halfWidth / scale));
		@@ -757,6 +762,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold
		mSourceBounds.offsetTo(mSourceBounds.left,
		mWindowBounds.height() - mSourceBounds.height());
		}
		return !mSourceBounds.equals(oldSourceBounds);
		}

		private void calculateMagnificationFrameBoundary() {
		@@ -1079,7 +1085,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold
		pw.println(" mMagnificationFrame:"
		+ (isWindowVisible() ? mMagnificationFrame : "empty"));
		pw.println(" mSourceBounds:"
		+ (isWindowVisible() ? mSourceBounds : "empty"));
		+ (mSourceBounds.isEmpty() ? "empty" : mSourceBounds));
		pw.println(" mSystemGestureTop:" + mSystemGestureTop);
		pw.println(" mMagnificationFrameOffsetX:" + mMagnificationFrameOffsetX);
		pw.println(" mMagnificationFrameOffsetY:" + mMagnificationFrameOffsetY);

packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java

+14 −5

Original line number	Diff line number	Diff line
		@@ -172,17 +172,26 @@ public class WindowMagnificationControllerTest extends SysuiTestCase {

		@Test
		public void enableWindowMagnification_notifySourceBoundsChanged() {
		mInstrumentation.runOnMainSync(() -> {
		mWindowMagnificationController.enableWindowMagnification(Float.NaN, Float.NaN,
		mInstrumentation.runOnMainSync(
		() -> mWindowMagnificationController.enableWindowMagnification(Float.NaN, Float.NaN,
		Float.NaN, /* magnificationFrameOffsetRatioX= */ 0,
		/* magnificationFrameOffsetRatioY= */ 0, null);
		});
		/* magnificationFrameOffsetRatioY= */ 0, null));

		// Waits for the surface created
		verify(mWindowMagnifierCallback, timeout(LAYOUT_CHANGE_TIMEOUT_MS)).onSourceBoundsChanged(
		(eq(mContext.getDisplayId())), any());
		}

		@Test
		public void enableWindowMagnification_disabled_notifySourceBoundsChanged() {
		enableWindowMagnification_notifySourceBoundsChanged();
		mInstrumentation.runOnMainSync(
		() -> mWindowMagnificationController.deleteWindowMagnification(null));
		Mockito.reset(mWindowMagnifierCallback);

		enableWindowMagnification_notifySourceBoundsChanged();
		}

		@Test
		public void enableWindowMagnification_withAnimation_schedulesFrame() {
		mInstrumentation.runOnMainSync(() -> {