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

Commit 2b70f83f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Only run Animation#setBackdropColor on overriden app transition" into tm-dev

parents 12873579 96b645d0

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

+3 −4
Original line number Diff line number Diff line
@@ -683,6 +683,9 @@ public class AppTransition implements Dump { 
        } else if (mNextAppTransitionType == NEXT_TRANSIT_TYPE_CUSTOM) {

            a = mTransitionAnimation.loadAppTransitionAnimation(mNextAppTransitionPackage,

                    enter ? mNextAppTransitionEnter : mNextAppTransitionExit);

            if (mNextAppTransitionBackgroundColor != 0) {

                a.setBackdropColor(mNextAppTransitionBackgroundColor);

            }

            ProtoLog.v(WM_DEBUG_APP_TRANSITIONS_ANIM,

                    "applyAnimation: anim=%s nextAppTransition=ANIM_CUSTOM transit=%s "

                            + "isEntrance=%b Callers=%s",
@@ -842,10 +845,6 @@ public class AppTransition implements Dump { 
        }

        setAppTransitionFinishedCallbackIfNeeded(a);



        if (mNextAppTransitionBackgroundColor != 0) {

            a.setBackdropColor(mNextAppTransitionBackgroundColor);

        }



        return a;

    }