Merge "Do not offset PiP when auto-enter-pip is ongoing" into tm-dev (d05dbf68) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -1292,7 +1292,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
		*/
		public void scheduleOffsetPip(Rect originalBounds, int offset, int duration,
		Consumer<Rect> updateBoundsCallback) {
		if (mPipTransitionState.shouldBlockResizeRequest()) {
		if (mPipTransitionState.shouldBlockResizeRequest()
		\|\| mPipTransitionState.getInSwipePipToHomeTransition()) {
		return;
		}
		if (mWaitForFixedRotation) {