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

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

Merge "Skip onMovementBoundsChanged when waiting for fixed rotation" into sc-dev am: fe8d6de4 

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

Change-Id: I4e0179afae3cee599f69e5d9c122bbe4223ebb9e
parents 378e1f28 fe8d6de4

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

+8 −4
Original line number Diff line number Diff line
@@ -815,10 +815,14 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
    public void onMovementBoundsChanged(Rect destinationBoundsOut, boolean fromRotation,

            boolean fromImeAdjustment, boolean fromShelfAdjustment,

            WindowContainerTransaction wct) {

        // note that this can be called when swiping pip to home is happening. For instance,

        // swiping an app in landscape to portrait home. skip this entirely if that's the case.

        if (mInSwipePipToHomeTransition && fromRotation) {

            if (DEBUG) Log.d(TAG, "skip onMovementBoundsChanged due to swipe-pip-to-home");

        // 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) {

            if (DEBUG) {

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

                        + " mInSwipePipToHomeTransition=" + mInSwipePipToHomeTransition

                        + " mWaitForFixedRotation=" + mWaitForFixedRotation);

            }

            return;

        }

        final PipAnimationController.PipTransitionAnimator animator =