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

Commit bb4f84d5 authored by Mateusz Cicheński's avatar Mateusz Cicheński Committed by Automerger Merge Worker
Browse files

Merge "Fix enter pip animation in fixed rotation with KCA flag on" into... 

Merge "Fix enter pip animation in fixed rotation with KCA flag on" into tm-qpr-dev am: 6a2a8f53 am: db11b1ce

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



Change-Id: I39d39a2e365be4328110e36bb02f50eb23361079
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a86dfbdc db11b1ce

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

+12 −15
Original line number Diff line number Diff line
@@ -1176,20 +1176,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 


        final Rect newDestinationBounds = mPipBoundsAlgorithm.getEntryDestinationBounds();

        if (newDestinationBounds.equals(currentDestinationBounds)) return;

        if (animator.getAnimationType() == ANIM_TYPE_BOUNDS) {

            if (mWaitForFixedRotation) {

                // The new destination bounds are in next rotation (DisplayLayout has been rotated

                // in computeRotatedBounds). The animation runs in previous rotation so the end

                // bounds need to be transformed.

                final Rect displayBounds = mPipBoundsState.getDisplayBounds();

                final Rect rotatedEndBounds = new Rect(newDestinationBounds);

                rotateBounds(rotatedEndBounds, displayBounds, mNextRotation, mCurrentRotation);

                animator.updateEndValue(rotatedEndBounds);

            } else {

                animator.updateEndValue(newDestinationBounds);

            }

        }

        animator.setDestinationBounds(newDestinationBounds);

        updateAnimatorBounds(newDestinationBounds);

        destinationBoundsOut.set(newDestinationBounds);

    }
@@ -1201,8 +1188,18 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
                mPipAnimationController.getCurrentAnimator();

        if (animator != null && animator.isRunning()) {

            if (animator.getAnimationType() == ANIM_TYPE_BOUNDS) {

                if (mWaitForFixedRotation) {

                    // The new destination bounds are in next rotation (DisplayLayout has been

                    // rotated in computeRotatedBounds). The animation runs in previous rotation so

                    // the end bounds need to be transformed.

                    final Rect displayBounds = mPipBoundsState.getDisplayBounds();

                    final Rect rotatedEndBounds = new Rect(bounds);

                    rotateBounds(rotatedEndBounds, displayBounds, mNextRotation, mCurrentRotation);

                    animator.updateEndValue(rotatedEndBounds);

                } else {

                    animator.updateEndValue(bounds);

                }

            }

            animator.setDestinationBounds(bounds);

        }

    }