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

Commit 95c1ffd9 authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Move wallpaper transition leashes to the back" into udc-dev am: f11d33ba 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23269401



Change-Id: I20b5e9a0d19ca44d47b637f6c6f45ae7d467b9ce
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7397b8f1 f11d33ba

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

+8 −1
Original line number Diff line number Diff line
@@ -176,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) {