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

Commit 6fb7cd83 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... 

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

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

Change-Id: I5d6c1900c3826ae6185868dbca96d2dc58e1c92b
parents 10191dc2 13aef6e8

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;

        }