Merge "[PiP2] Only save reentry state on expand" into main (dd56cbca) · Commits · e / os / android_frameworks_base

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -627,6 +627,12 @@ public class PipTransition extends PipTransitionController implements
		finishTransition();
		});
		cacheAndStartTransitionAnimator(animator);

		// Save the PiP bounds in case, we re-enter the PiP with the same component.
		float snapFraction = mPipBoundsAlgorithm.getSnapFraction(
		mPipBoundsState.getBounds());
		mPipBoundsState.saveReentryState(snapFraction);

		return true;
		}

		@@ -912,11 +918,6 @@ public class PipTransition extends PipTransitionController implements
		"Unexpected bundle for " + mPipTransitionState);
		break;
		case PipTransitionState.EXITED_PIP:
		// Save the PiP bounds in case, we re-enter the PiP with the same component.
		float snapFraction = mPipBoundsAlgorithm.getSnapFraction(
		mPipBoundsState.getBounds());
		mPipBoundsState.saveReentryState(snapFraction);

		mPipTransitionState.setPinnedTaskLeash(null);
		mPipTransitionState.setPipTaskInfo(null);
		break;