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

Commit 808af015 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Pass sourceRectHint to auto-enter-pip transition" into tm-dev am: d34d3b48 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17697036



Change-Id: Ibb5ffeeefe0d8991571c98f6f3350cf731673ad1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b18816e d34d3b48

quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java

+5 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim { 
    private final int mTaskId;

    private final ComponentName mComponentName;

    private final SurfaceControl mLeash;

    private final Rect mSourceRectHint = new Rect();

    private final Rect mAppBounds = new Rect();

    private final Matrix mHomeToWindowPositionMap = new Matrix();

    private final Rect mStartBounds = new Rect();
@@ -140,6 +141,7 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim { 
        }



        if (sourceRectHint == null) {

            mSourceRectHint.setEmpty();

            mSourceHintRectInsets = null;



            // Create a new overlay layer
@@ -169,6 +171,7 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim { 
                t.apply();

            });

        } else {

            mSourceRectHint.set(sourceRectHint);

            mSourceHintRectInsets = new Rect(sourceRectHint.left - appBounds.left,

                    sourceRectHint.top - appBounds.top,

                    appBounds.right - sourceRectHint.right,
@@ -249,7 +252,8 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim { 
            return mSurfaceTransactionHelper.scaleAndRotate(tx, mLeash, mAppBounds, bounds, insets,

                    rotatedPosition.degree, rotatedPosition.positionX, rotatedPosition.positionY);

        } else {

            return mSurfaceTransactionHelper.scaleAndCrop(tx, mLeash, mAppBounds, bounds, insets);

            return mSurfaceTransactionHelper.scaleAndCrop(tx, mLeash, mSourceRectHint, mAppBounds,

                    bounds, insets);

        }

    }