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

Commit f8764f37 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... 

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

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



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

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();