Merge "Move wallpaper transition leashes to the back" into udc-dev am: f11d33ba2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23269401 Change-Id: I20b5e9a0d19ca44d47b637f6c6f45ae7d467b9ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user