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

Commit 67af5b4b 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: 8c1b3765

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



Change-Id: I2288f2286229577547e3017b89c0044ec3a10609
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 32f68dfb 8c1b3765

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

+3 −4
Original line number Diff line number Diff line
@@ -676,6 +676,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",
@@ -835,10 +838,6 @@ public class AppTransition implements Dump { 
        }

        setAppTransitionFinishedCallbackIfNeeded(a);



        if (mNextAppTransitionBackgroundColor != 0) {

            a.setBackdropColor(mNextAppTransitionBackgroundColor);

        }



        return a;

    }