Merge "Move exit PiP leash to the transition root" into tm-qpr-dev am: 18ef8a8d97 (77f7173c) · Commits · e / os / android_frameworks_base

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

+29 −13

Original line number	Original line	Diff line number	Diff line
	@@ -335,6 +335,7 @@ public class PipTransition extends PipTransitionController {
	final ActivityManager.RunningTaskInfo taskInfo = mPipOrganizer.getTaskInfo();		final ActivityManager.RunningTaskInfo taskInfo = mPipOrganizer.getTaskInfo();
	if (taskInfo != null) {		if (taskInfo != null) {
	startExpandAnimation(taskInfo, mPipOrganizer.getSurfaceControl(),		startExpandAnimation(taskInfo, mPipOrganizer.getSurfaceControl(),
			mPipBoundsState.getBounds(), mPipBoundsState.getBounds(),
	new Rect(mExitDestinationBounds), Surface.ROTATION_0);		new Rect(mExitDestinationBounds), Surface.ROTATION_0);
	}		}
	mExitDestinationBounds.setEmpty();		mExitDestinationBounds.setEmpty();
	@@ -475,6 +476,20 @@ public class PipTransition extends PipTransitionController {
	taskInfo);		taskInfo);
	return;		return;
	}		}

			// When exiting PiP, the PiP leash may be an Activity of a multi-windowing Task, for which
			// case it may not be in the screen coordinate.
			// Reparent the pip leash to the root with max layer so that we can animate it outside of
			// parent crop, and make sure it is not covered by other windows.
			final SurfaceControl pipLeash = pipChange.getLeash();
			startTransaction.reparent(pipLeash, info.getRootLeash());
			startTransaction.setLayer(pipLeash, Integer.MAX_VALUE);
			// Note: because of this, the bounds to animate should be translated to the root coordinate.
			final Point offset = info.getRootOffset();
			final Rect currentBounds = mPipBoundsState.getBounds();
			currentBounds.offset(-offset.x, -offset.y);
			startTransaction.setPosition(pipLeash, currentBounds.left, currentBounds.top);

	mFinishCallback = (wct, wctCB) -> {		mFinishCallback = (wct, wctCB) -> {
	mPipOrganizer.onExitPipFinished(taskInfo);		mPipOrganizer.onExitPipFinished(taskInfo);
	finishCallback.onTransitionFinished(wct, wctCB);		finishCallback.onTransitionFinished(wct, wctCB);
	@@ -496,18 +511,17 @@ public class PipTransition extends PipTransitionController {
	if (displayRotationChange != null) {		if (displayRotationChange != null) {
	// Exiting PIP to fullscreen with orientation change.		// Exiting PIP to fullscreen with orientation change.
	startExpandAndRotationAnimation(info, startTransaction, finishTransaction,		startExpandAndRotationAnimation(info, startTransaction, finishTransaction,
	displayRotationChange, taskInfo, pipChange);		displayRotationChange, taskInfo, pipChange, offset);
	return;		return;
	}		}
	}		}

	// Set the initial frame as scaling the end to the start.		// Set the initial frame as scaling the end to the start.
	final Rect destinationBounds = new Rect(pipChange.getEndAbsBounds());		final Rect destinationBounds = new Rect(pipChange.getEndAbsBounds());
	final Point offset = pipChange.getEndRelOffset();
	destinationBounds.offset(-offset.x, -offset.y);		destinationBounds.offset(-offset.x, -offset.y);
	startTransaction.setWindowCrop(pipChange.getLeash(), destinationBounds);		startTransaction.setWindowCrop(pipLeash, destinationBounds);
	mSurfaceTransactionHelper.scale(startTransaction, pipChange.getLeash(),		mSurfaceTransactionHelper.scale(startTransaction, pipLeash, destinationBounds,
	destinationBounds, mPipBoundsState.getBounds());		currentBounds);
	startTransaction.apply();		startTransaction.apply();

	// Check if it is fixed rotation.		// Check if it is fixed rotation.
	@@ -532,19 +546,21 @@ public class PipTransition extends PipTransitionController {
	y = destinationBounds.bottom;		y = destinationBounds.bottom;
	}		}
	mSurfaceTransactionHelper.rotateAndScaleWithCrop(finishTransaction,		mSurfaceTransactionHelper.rotateAndScaleWithCrop(finishTransaction,
	pipChange.getLeash(), endBounds, endBounds, new Rect(), degree, x, y,		pipLeash, endBounds, endBounds, new Rect(), degree, x, y,
	true /* isExpanding /, rotationDelta == ROTATION_270 / clockwise */);		true /* isExpanding /, rotationDelta == ROTATION_270 / clockwise */);
	} else {		} else {
	rotationDelta = Surface.ROTATION_0;		rotationDelta = Surface.ROTATION_0;
	}		}
	startExpandAnimation(taskInfo, pipChange.getLeash(), destinationBounds, rotationDelta);		startExpandAnimation(taskInfo, pipLeash, currentBounds, currentBounds, destinationBounds,
			rotationDelta);
	}		}

	private void startExpandAndRotationAnimation(@NonNull TransitionInfo info,		private void startExpandAndRotationAnimation(@NonNull TransitionInfo info,
	@NonNull SurfaceControl.Transaction startTransaction,		@NonNull SurfaceControl.Transaction startTransaction,
	@NonNull SurfaceControl.Transaction finishTransaction,		@NonNull SurfaceControl.Transaction finishTransaction,
	@NonNull TransitionInfo.Change displayRotationChange,		@NonNull TransitionInfo.Change displayRotationChange,
	@NonNull TaskInfo taskInfo, @NonNull TransitionInfo.Change pipChange) {		@NonNull TaskInfo taskInfo, @NonNull TransitionInfo.Change pipChange,
			@NonNull Point offset) {
	final int rotateDelta = deltaRotation(displayRotationChange.getStartRotation(),		final int rotateDelta = deltaRotation(displayRotationChange.getStartRotation(),
	displayRotationChange.getEndRotation());		displayRotationChange.getEndRotation());

	@@ -556,7 +572,6 @@ public class PipTransition extends PipTransitionController {
	final Rect startBounds = new Rect(pipChange.getStartAbsBounds());		final Rect startBounds = new Rect(pipChange.getStartAbsBounds());
	rotateBounds(startBounds, displayRotationChange.getStartAbsBounds(), rotateDelta);		rotateBounds(startBounds, displayRotationChange.getStartAbsBounds(), rotateDelta);
	final Rect endBounds = new Rect(pipChange.getEndAbsBounds());		final Rect endBounds = new Rect(pipChange.getEndAbsBounds());
	final Point offset = pipChange.getEndRelOffset();
	startBounds.offset(-offset.x, -offset.y);		startBounds.offset(-offset.x, -offset.y);
	endBounds.offset(-offset.x, -offset.y);		endBounds.offset(-offset.x, -offset.y);

	@@ -592,11 +607,12 @@ public class PipTransition extends PipTransitionController {
	}		}

	private void startExpandAnimation(final TaskInfo taskInfo, final SurfaceControl leash,		private void startExpandAnimation(final TaskInfo taskInfo, final SurfaceControl leash,
	final Rect destinationBounds, final int rotationDelta) {		final Rect baseBounds, final Rect startBounds, final Rect endBounds,
			final int rotationDelta) {
	final PipAnimationController.PipTransitionAnimator animator =		final PipAnimationController.PipTransitionAnimator animator =
	mPipAnimationController.getAnimator(taskInfo, leash, mPipBoundsState.getBounds(),		mPipAnimationController.getAnimator(taskInfo, leash, baseBounds, startBounds,
	mPipBoundsState.getBounds(), destinationBounds, null,		endBounds, null /* sourceHintRect */, TRANSITION_DIRECTION_LEAVE_PIP,
	TRANSITION_DIRECTION_LEAVE_PIP, 0 /* startingAngle */, rotationDelta);		0 /* startingAngle */, rotationDelta);
	animator.setTransitionDirection(TRANSITION_DIRECTION_LEAVE_PIP)		animator.setTransitionDirection(TRANSITION_DIRECTION_LEAVE_PIP)
	.setPipAnimationCallback(mPipAnimationCallback)		.setPipAnimationCallback(mPipAnimationCallback)
	.setDuration(mEnterExitAnimationDuration)		.setDuration(mEnterExitAnimationDuration)