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

Commit 4ddec89f authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Do not show animation background with wallpaper transition" into tm-dev am: dc19fc3b 

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



Change-Id: I22f68f6eb7f1e05d0efda991fbdb11baadb14c5c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 10e98e10 dc19fc3b

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java

+2 −1
Original line number Diff line number Diff line
@@ -417,7 +417,8 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { 
                            || type == TRANSIT_TO_FRONT

                            || type == TRANSIT_TO_BACK;

                    final boolean isTranslucent = (change.getFlags() & FLAG_TRANSLUCENT) != 0;

                    if (isOpenOrCloseTransition && !isTranslucent) {

                    if (isOpenOrCloseTransition && !isTranslucent

                            && wallpaperTransit == WALLPAPER_TRANSITION_NONE) {

                        // Use the overview background as the background for the animation

                        final Context uiContext = ActivityThread.currentActivityThread()

                                .getSystemUiContext();