Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b346d3a6 authored by Hongwei Wang's avatar Hongwei Wang Committed by Android (Google) Code Review
Browse files

Merge "Do not skip onMovementBoundsChanged if already in PiP" into sc-v2-dev

parents 5ccd2848 298da246

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

+5 −2
Original line number Diff line number Diff line
@@ -828,11 +828,14 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
            WindowContainerTransaction wct) {

        // note that this can be called when swipe-to-home or fixed-rotation is happening.

        // Skip this entirely if that's the case.

        if ((mInSwipePipToHomeTransition || mWaitForFixedRotation) && fromRotation) {

        final boolean waitForFixedRotationOnEnteringPip = mWaitForFixedRotation

                && (mPipTransitionState.getTransitionState() != PipTransitionState.ENTERED_PIP);

        if ((mInSwipePipToHomeTransition || waitForFixedRotationOnEnteringPip) && fromRotation) {

            if (DEBUG) {

                Log.d(TAG, "Skip onMovementBoundsChanged on rotation change"

                        + " mInSwipePipToHomeTransition=" + mInSwipePipToHomeTransition

                        + " mWaitForFixedRotation=" + mWaitForFixedRotation);

                        + " mWaitForFixedRotation=" + mWaitForFixedRotation

                        + " getTransitionState=" + mPipTransitionState.getTransitionState());

            }

            return;

        }