Merge "Opening type changes need alpha=1 when PiPing" into main (40df1d1b) · Commits · e / os / android_frameworks_base

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@ import com.android.wm.shell.common.pip.PipUtils;
		import com.android.wm.shell.pip.PipTransitionController;
		import com.android.wm.shell.pip2.animation.PipAlphaAnimator;
		import com.android.wm.shell.pip2.animation.PipEnterExitAnimator;
		import com.android.wm.shell.shared.TransitionUtil;
		import com.android.wm.shell.shared.pip.PipContentOverlay;
		import com.android.wm.shell.sysui.ShellInit;
		import com.android.wm.shell.transition.Transitions;
		@@ -405,6 +406,18 @@ public class PipTransition extends PipTransitionController implements
		sourceRectHint = pipChange.getTaskInfo().pictureInPictureParams.getSourceRectHint();
		}

		// For opening type transitions, if there is a non-pip change of mode TO_FRONT/OPEN,
		// make sure that change has alpha of 1f, since it's init state might be set to alpha=0f
		// by the Transitions framework to simplify Task opening transitions.
		if (TransitionUtil.isOpeningType(info.getType())) {
		for (TransitionInfo.Change change : info.getChanges()) {
		if (change.getLeash() == null \|\| change == pipChange) continue;
		if (change.getMode() == TRANSIT_OPEN \|\| change.getMode() == TRANSIT_TO_FRONT) {
		startTransaction.setAlpha(change.getLeash(), 1f);
		}
		}
		}

		PipEnterExitAnimator animator = new PipEnterExitAnimator(mContext, pipLeash,
		startTransaction, finishTransaction, startBounds, startBounds, endBounds,
		sourceRectHint, PipEnterExitAnimator.BOUNDS_ENTER, Surface.ROTATION_0);