diff options
| author | 2024-07-16 17:59:22 +0000 | |
|---|---|---|
| committer | 2024-07-16 17:59:22 +0000 | |
| commit | d659822b0642f0994bcdd517ca900c4202050b8b (patch) | |
| tree | 798b2ac7db1db86aedb62f60cc0207d13b7f1a37 | |
| parent | 9f9117ec55c32db8354a764b58a37e5073b8d39e (diff) | |
| parent | 715b419cf5c1f33b32d8c32f5482b46422b3986c (diff) | |
Merge "Revert "Push wallpapers on the back during transitions"" into main
| -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 8d53bebba7bb..fc8b1d27ad02 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 @@ -79,7 +79,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; @@ -582,14 +581,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) { |