Merge "Revert "Push wallpapers on the back during transitions"" into main (d659822b) · Commits · e / os / android_frameworks_base

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

+0 −9

Original line number	Diff line number	Diff line
		@@ -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) {