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

Commit 3d95aea3 authored by Marzia Favaro's avatar Marzia Favaro Committed by Android Build Coastguard Worker
Browse files

Push wallpapers on the back during transitions 

Fix: 350617801
Test: Manual, verify wallpaper stays on the back when opening app pair
Test: Manual, unlock device with separate lock/home  wallpapers
Flag: com.android.window.flags.ensure_wallpaper_in_transitions
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7bc428e7762f59e521ae4e8c8365cba02e7ff82b)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:26a0d430edfbb330e41f6e9741433e1212c88b37)
Merged-In: Ie6bd4d18bfe67ca27b791a666d5b0bff6199773c
Change-Id: Ie6bd4d18bfe67ca27b791a666d5b0bff6199773c
parent b7080b6a

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.common.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) {