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

Commit 31f2b619 authored by Chet Haase's avatar Chet Haase Committed by Android (Google) Code Review
Browse files

Merge "Fix artifacts in clip reveal animations"

parents 0314fa28 8da976a4

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

+3 −1
Original line number Diff line number Diff line
@@ -977,7 +977,9 @@ public class AppTransition implements Dump { 
                            + " anim=" + a + " nextAppTransition=ANIM_CUSTOM_IN_PLACE"

                            + " transit=" + transit + " Callers=" + Debug.getCallers(3));

        } else if (mNextAppTransitionType == NEXT_TRANSIT_TYPE_CLIP_REVEAL) {

            a = createClipRevealAnimationLocked(transit, enter, appWidth, appHeight);

            a = createClipRevealAnimationLocked(transit, enter,

                    containingFrame.right - containingFrame.left,

                    containingFrame.bottom - containingFrame.top);

            if (DEBUG_APP_TRANSITIONS || DEBUG_ANIM) Slog.v(TAG,

                    "applyAnimation:"

                            + " anim=" + a + " nextAppTransition=ANIM_CLIP_REVEAL"

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

+2 −0
Original line number Diff line number Diff line
@@ -1139,6 +1139,8 @@ class WindowStateAnimator { 
                    mShownAlpha *= appTransformation.getAlpha();

                    if (appTransformation.hasClipRect()) {

                        mClipRect.set(appTransformation.getClipRect());

                        // Account for non-fullscreen windows

                        mClipRect.offset(frame.left, frame.top);

                        if (mWin.mHScale > 0) {

                            mClipRect.left /= mWin.mHScale;

                            mClipRect.right /= mWin.mHScale;