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

Commit 92180ed0 authored by Marzia Favaro's avatar Marzia Favaro
Browse files

Move wallpaper transition leashes to the back 

Fix: 282852886
Change-Id: I38bcdd7e5f5e12f0ccd1bb3c80d0b5942366e31d
parent fd8948a9

libs/WindowManager/Shell/src/com/android/wm/shell/util/TransitionUtil.java

+8 −3
Original line number Diff line number Diff line
@@ -24,9 +24,7 @@ import static android.view.WindowManager.LayoutParams.INVALID_WINDOW_TYPE; 
import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;

import static android.view.WindowManager.TRANSIT_CHANGE;

import static android.view.WindowManager.TRANSIT_CLOSE;

import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY;

import static android.view.WindowManager.TRANSIT_KEYGUARD_GOING_AWAY;

import static android.view.WindowManager.TRANSIT_KEYGUARD_UNOCCLUDE;

import static android.view.WindowManager.TRANSIT_OPEN;

import static android.view.WindowManager.TRANSIT_TO_BACK;

import static android.view.WindowManager.TRANSIT_TO_FRONT;
@@ -178,7 +176,14 @@ public class TransitionUtil { 
        }



        // Put all the OPEN/SHOW on top

        if (TransitionUtil.isOpeningType(mode)) {

        if ((change.getFlags() & FLAG_IS_WALLPAPER) != 0) {

            // Wallpaper is always at the bottom, opening wallpaper on top of closing one.

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

                t.setLayer(leash, -zSplitLine + info.getChanges().size() - layer);

            } else {

                t.setLayer(leash, -zSplitLine - layer);

            }

        } else if (TransitionUtil.isOpeningType(mode)) {

            if (isOpening) {

                t.setLayer(leash, zSplitLine + info.getChanges().size() - layer);

                if ((change.getFlags() & FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT) == 0) {