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

Commit 13aef6e8 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I8fa758907d0872931861d0c720e99383d68fa3eb
parents 79f1fadb b346d3a6

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;

        }