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

Commit 715b419c authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Revert "Push wallpapers on the back during transitions" 

This reverts commit 7bc428e7.

Reason for revert: Should be unneeded after wallpaper change reported correctly.

Change-Id: I669837c4368b83412bd06d174980406aa993d9ab
parent 7bc428e7

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

+0 −9
Original line number Original line Diff line number Diff line
@@ -76,7 +76,6 @@ import androidx.annotation.BinderThread; 
import com.android.internal.R;

import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.protolog.ProtoLog;

import com.android.internal.protolog.ProtoLog;

import com.android.window.flags.Flags;

import com.android.wm.shell.RootTaskDisplayAreaOrganizer;

import com.android.wm.shell.RootTaskDisplayAreaOrganizer;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.common.DisplayController;

import com.android.wm.shell.common.DisplayController;
@@ -586,14 +585,6 @@ public class Transitions implements RemoteCallable<Transitions>, 
        final boolean isOpening = isOpeningType(transitType);

        final boolean isOpening = isOpeningType(transitType);

        final boolean isClosing = isClosingType(transitType);

        final boolean isClosing = isClosingType(transitType);

        final int mode = change.getMode();

        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

        // Put all the OPEN/SHOW on top

        if (mode == TRANSIT_OPEN || mode == TRANSIT_TO_FRONT) {

        if (mode == TRANSIT_OPEN || mode == TRANSIT_TO_FRONT) {

            if (isOpening) {

            if (isOpening) {