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

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

Change-Id: I22f68f6eb7f1e05d0efda991fbdb11baadb14c5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2022-04-12 05:47:02 +00:00
committed by Automerger Merge Worker

View File

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