Merge "Mixed transitions can enter PiP if scheduled only" into main (3e4d4369) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -447,7 +447,8 @@ public class PipTransition extends PipTransitionController implements
		@Override
		public boolean isEnteringPip(@NonNull TransitionInfo.Change change,
		@WindowManager.TransitionType int transitType) {
		if (change.getTaskInfo() != null
		if (mPipTransitionState.getState() == PipTransitionState.SCHEDULED_ENTER_PIP
		&& change.getTaskInfo() != null
		&& change.getTaskInfo().getWindowingMode() == WINDOWING_MODE_PINNED) {
		// TRANSIT_TO_FRONT, though uncommon with triggering PiP, should semantically also
		// be allowed to animate if the task in question is pinned already - see b/308054074.