Merge "Remove starting destination bounds on BOUNDS PIP Shell Transition." into sc-v2-dev (dd394483) · Commits · e / os / android_frameworks_base

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

+0 −1

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

		private void onEndOfSwipePipToHomeTransition() {
		if (Transitions.ENABLE_SHELL_TRANSITIONS) {
		mPipTransitionState.setInSwipePipToHomeTransition(false);
		mSwipePipToHomeOverlay = null;
		return;
		}

+7 −3

Original line number	Diff line number	Diff line
		@@ -170,9 +170,12 @@ public class PipTransition extends PipTransitionController {
		if (request.getType() == TRANSIT_PIP) {
		WindowContainerTransaction wct = new WindowContainerTransaction();
		mPipTransitionState.setTransitionState(PipTransitionState.ENTRY_SCHEDULED);
		if (mOneShotAnimationType == ANIM_TYPE_ALPHA) {
		wct.setActivityWindowingMode(request.getTriggerTask().token,
		WINDOWING_MODE_UNDEFINED);
		final Rect destinationBounds = mPipBoundsAlgorithm.getEntryDestinationBounds();
		wct.setActivityWindowingMode(request.getTriggerTask().token, WINDOWING_MODE_UNDEFINED);
		wct.setBounds(request.getTriggerTask().token, destinationBounds);
		}
		return wct;
		} else {
		return null;
		@@ -243,6 +246,7 @@ public class PipTransition extends PipTransitionController {
		onFinishResize(taskInfo, destinationBounds, TRANSITION_DIRECTION_TO_PIP, tx);
		sendOnPipTransitionFinished(TRANSITION_DIRECTION_TO_PIP);
		mFinishCallback = null;
		mPipTransitionState.setInSwipePipToHomeTransition(false);
		return true;
		}