From cb5c35e5d1ff5f3e3b99cde590040dc76d98653f Mon Sep 17 00:00:00 2001 From: Hongwei Wang Date: Thu, 10 Jun 2021 17:59:00 -0700 Subject: [PATCH] Calculate the position from start bounds for auto-enter PiP Video: http://recall/-/aaaaaabFQoRHlzixHdtY/eUpkH2il1vYBVBPt1Vks2u Bug: 190748719 Test: manual, see video Change-Id: I053bd5607200ad6341d04c9bcfec5222f101cf65 --- .../quickstep/util/SwipePipToHomeAnimator.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java index 36311302bf..61bd82cd39 100644 --- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java +++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java @@ -289,16 +289,16 @@ public class SwipePipToHomeAnimator extends ValueAnimator { final float degree, positionX, positionY; if (mFromRotation == Surface.ROTATION_90) { degree = -90 * fraction; - positionX = fraction * (mDestinationBoundsTransformed.left - mAppBounds.left) - + mAppBounds.left; - positionY = fraction * (mDestinationBoundsTransformed.bottom - mAppBounds.top) - + mAppBounds.top; + positionX = fraction * (mDestinationBoundsTransformed.left - mStartBounds.left) + + mStartBounds.left; + positionY = fraction * (mDestinationBoundsTransformed.bottom - mStartBounds.top) + + mStartBounds.top; } else { degree = 90 * fraction; - positionX = fraction * (mDestinationBoundsTransformed.right - mAppBounds.left) - + mAppBounds.left; - positionY = fraction * (mDestinationBoundsTransformed.top - mAppBounds.top) - + mAppBounds.top; + positionX = fraction * (mDestinationBoundsTransformed.right - mStartBounds.left) + + mStartBounds.left; + positionY = fraction * (mDestinationBoundsTransformed.top - mStartBounds.top) + + mStartBounds.top; } return new RotatedPosition(degree, positionX, positionY); }