Merge "Fix enter pip animation in fixed rotation with KCA flag on" into tm-qpr-dev (6a2a8f53) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+12 −15

Original line number	Diff line number	Diff line
		@@ -1178,20 +1178,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,

		final Rect newDestinationBounds = mPipBoundsAlgorithm.getEntryDestinationBounds();
		if (newDestinationBounds.equals(currentDestinationBounds)) return;
		if (animator.getAnimationType() == ANIM_TYPE_BOUNDS) {
		if (mWaitForFixedRotation) {
		// The new destination bounds are in next rotation (DisplayLayout has been rotated
		// in computeRotatedBounds). The animation runs in previous rotation so the end
		// bounds need to be transformed.
		final Rect displayBounds = mPipBoundsState.getDisplayBounds();
		final Rect rotatedEndBounds = new Rect(newDestinationBounds);
		rotateBounds(rotatedEndBounds, displayBounds, mNextRotation, mCurrentRotation);
		animator.updateEndValue(rotatedEndBounds);
		} else {
		animator.updateEndValue(newDestinationBounds);
		}
		}
		animator.setDestinationBounds(newDestinationBounds);
		updateAnimatorBounds(newDestinationBounds);
		destinationBoundsOut.set(newDestinationBounds);
		}

		@@ -1203,8 +1190,18 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
		mPipAnimationController.getCurrentAnimator();
		if (animator != null && animator.isRunning()) {
		if (animator.getAnimationType() == ANIM_TYPE_BOUNDS) {
		if (mWaitForFixedRotation) {
		// The new destination bounds are in next rotation (DisplayLayout has been
		// rotated in computeRotatedBounds). The animation runs in previous rotation so
		// the end bounds need to be transformed.
		final Rect displayBounds = mPipBoundsState.getDisplayBounds();
		final Rect rotatedEndBounds = new Rect(bounds);
		rotateBounds(rotatedEndBounds, displayBounds, mNextRotation, mCurrentRotation);
		animator.updateEndValue(rotatedEndBounds);
		} else {
		animator.updateEndValue(bounds);
		}
		}
		animator.setDestinationBounds(bounds);
		}
		}