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

Commit b93d6b3c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not skip onMovementBoundsChanged if already in PiP" into sc-dev am: 99bded16 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14983324

Change-Id: Id6c22fcd52b323e25e4cdb80531d8086a7747114
parents 3e64f4f0 99bded16

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

+5 −2
Original line number Diff line number Diff line
@@ -835,11 +835,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

                && (mState != State.ENTERED_PIP);

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

            if (DEBUG) {

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

                        + " mInSwipePipToHomeTransition=" + mInSwipePipToHomeTransition

                        + " mWaitForFixedRotation=" + mWaitForFixedRotation);

                        + " mWaitForFixedRotation=" + mWaitForFixedRotation

                        + " mState=" + mState);

            }

            return;

        }