am 5acb30de: Merge "Apply the scale to surfaceinsets when computing crop region" (9e23ef21) · Commits · e / os / android_frameworks_base

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

+15 −4

Original line number	Diff line number	Diff line
		@@ -1417,10 +1417,21 @@ class WindowStateAnimator {

		// Adjust for surface insets.
		final LayoutParams attrs = w.getAttrs();
		width += attrs.surfaceInsets.left + attrs.surfaceInsets.right;
		height += attrs.surfaceInsets.top + attrs.surfaceInsets.bottom;
		left -= attrs.surfaceInsets.left;
		top -= attrs.surfaceInsets.top;
		final int displayId = w.getDisplayId();
		float scale = 1.0f;
		// Magnification is supported only for the default display.
		if (mService.mAccessibilityController != null && displayId == Display.DEFAULT_DISPLAY) {
		MagnificationSpec spec =
		mService.mAccessibilityController.getMagnificationSpecForWindowLocked(w);
		if (spec != null && !spec.isNop()) {
		scale = spec.scale;
		}
		}

		width += scale * (attrs.surfaceInsets.left + attrs.surfaceInsets.right);
		height += scale * (attrs.surfaceInsets.top + attrs.surfaceInsets.bottom);
		left -= scale * attrs.surfaceInsets.left;
		top -= scale * attrs.surfaceInsets.top;

		final boolean surfaceMoved = mSurfaceX != left \|\| mSurfaceY != top;
		if (surfaceMoved) {