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

Commit 51649da5 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge \"Ensure we pass correct values into the next transition start... 

Merge "Merge \"Ensure we pass correct values into the next transition start bounds.\" into nyc-mr1-dev am: 7a07477c" into nyc-mr1-dev-plus-aosp
parents d4921490 82b1cae7

services/core/java/com/android/server/wm/AppTransition.java

+2 −3
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ public class AppTransition implements Dump { 
            float scaleH = mTmpRect.height() / (float) appHeight;

            Animation scale = new ScaleAnimation(scaleW, 1, scaleH, 1,

                    computePivot(mTmpRect.left, scaleW),

                    computePivot(mTmpRect.right, scaleH));

                    computePivot(mTmpRect.top, scaleH));

            scale.setInterpolator(mDecelerateInterpolator);



            Animation alpha = new AlphaAnimation(0, 1);
@@ -1615,8 +1615,7 @@ public class AppTransition implements Dump { 
        if (isTransitionSet()) {

            clear();

            mNextAppTransitionType = NEXT_TRANSIT_TYPE_SCALE_UP;

            putDefaultNextAppTransitionCoordinates(startX, startY, startX + startWidth,

                    startY + startHeight, null);

            putDefaultNextAppTransitionCoordinates(startX, startY, startWidth, startHeight, null);

            postAnimationCallback();

        }

    }