Merge "Do not offset PiP when auto-enter-pip is ongoing" into tm-dev

This commit is contained in:
Hongwei Wang
2022-05-13 00:28:35 +00:00
committed by Android (Google) Code Review

View File

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