diff options
author | 2024-07-15 16:49:50 +0000 | |
---|---|---|
committer | 2024-07-15 16:49:50 +0000 | |
commit | 715b419cf5c1f33b32d8c32f5482b46422b3986c (patch) | |
tree | 68818e2edf66839fdb5f6c079fd28e43a81af528 | |
parent | 7bc428e7762f59e521ae4e8c8365cba02e7ff82b (diff) |
Revert "Push wallpapers on the back during transitions"
This reverts commit 7bc428e7762f59e521ae4e8c8365cba02e7ff82b.
Reason for revert: Should be unneeded after wallpaper change reported correctly.
Change-Id: I669837c4368b83412bd06d174980406aa993d9ab
-rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java index 3e6ac95a4fed..ec6802da85f6 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java @@ -76,7 +76,6 @@ import androidx.annotation.BinderThread; import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.protolog.ProtoLog; -import com.android.window.flags.Flags; import com.android.wm.shell.RootTaskDisplayAreaOrganizer; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayController; @@ -586,14 +585,6 @@ public class Transitions implements RemoteCallable<Transitions>, final boolean isOpening = isOpeningType(transitType); final boolean isClosing = isClosingType(transitType); final int mode = change.getMode(); - // Ensure wallpapers stay in the back - if (change.hasFlags(FLAG_IS_WALLPAPER) && Flags.ensureWallpaperInTransitions()) { - if (mode == TRANSIT_OPEN || mode == TRANSIT_TO_FRONT) { - return -zSplitLine + numChanges - i; - } else { - return -zSplitLine - i; - } - } // Put all the OPEN/SHOW on top if (mode == TRANSIT_OPEN || mode == TRANSIT_TO_FRONT) { if (isOpening) { |