Merge "Only remove overlay reference once it is faded out" into main (0d75a206) · Commits · e / os / android_frameworks_base

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

+10 −2

Original line number	Diff line number	Diff line
		@@ -554,6 +554,11 @@ public class PipTransition extends PipTransitionController {
		}
		}
		}
		// if overlay is present remove it immediately, as exit transition came before it faded out
		if (mPipOrganizer.mSwipePipToHomeOverlay != null) {
		startTransaction.remove(mPipOrganizer.mSwipePipToHomeOverlay);
		clearSwipePipToHomeOverlay();
		}
		if (pipChange == null) {
		ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,
		"%s: No window of exiting PIP is found. Can't play expand animation", TAG);
		@@ -1007,7 +1012,6 @@ public class PipTransition extends PipTransitionController {
		// the overlay to the final PIP task.
		startTransaction.reparent(swipePipToHomeOverlay, leash)
		.setLayer(swipePipToHomeOverlay, Integer.MAX_VALUE);
		mPipOrganizer.mSwipePipToHomeOverlay = null;
		}

		final Rect sourceBounds = pipTaskInfo.configuration.windowConfiguration.getBounds();
		@@ -1029,7 +1033,7 @@ public class PipTransition extends PipTransitionController {
		sendOnPipTransitionFinished(TRANSITION_DIRECTION_TO_PIP);
		if (swipePipToHomeOverlay != null) {
		mPipOrganizer.fadeOutAndRemoveOverlay(swipePipToHomeOverlay,
		null /* callback /, false / withStartDelay */);
		this::clearSwipePipToHomeOverlay /* callback /, false / withStartDelay */);
		}
		mPipTransitionState.setInSwipePipToHomeTransition(false);
		}
		@@ -1173,6 +1177,10 @@ public class PipTransition extends PipTransitionController {
		mPipMenuController.updateMenuBounds(destinationBounds);
		}

		private void clearSwipePipToHomeOverlay() {
		mPipOrganizer.mSwipePipToHomeOverlay = null;
		}

		@Override
		public void dump(PrintWriter pw, String prefix) {
		final String innerPrefix = prefix + " ";