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

Commit 7d093279 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Push wallpapers on the back during transitions" into main

parents 97374985 7bc428e7

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

+9 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 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;
@@ -579,6 +580,14 @@ 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) {