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

Commit 791a4390 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Only run Animation#setBackdropColor on overriden app transition" into... 

Merge "Only run Animation#setBackdropColor on overriden app transition" into tm-dev am: 2b70f83f am: db00c303

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



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

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;

    }