Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Initialize transition layer of wallpaper at bottom" into tm-qpr-dev am: e9ed7210ad" into tm-qpr-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2022-05-13 10:57:09 +00:00
committed by Android (Google) Code Review
parent e43a3b9c3c 24c11adbf3
commit 7cb54aff83
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -312,13 +312,14 @@ public class Transitions implements RemoteCallable<Transitions> {
if (info.getRootLeash().isValid()) { if (info.getRootLeash().isValid()) {
t.show(info.getRootLeash()); t.show(info.getRootLeash());
} }
final int numChanges = info.getChanges().size();
// Put animating stuff above this line and put static stuff below it. // Put animating stuff above this line and put static stuff below it.
int zSplitLine = info.getChanges().size(); final int zSplitLine = numChanges + 1;
// changes should be ordered top-to-bottom in z // changes should be ordered top-to-bottom in z
for (int i = info.getChanges().size() - 1; i >= 0; --i) { for (int i = numChanges - 1; i >= 0; --i) {
final TransitionInfo.Change change = info.getChanges().get(i); final TransitionInfo.Change change = info.getChanges().get(i);
final SurfaceControl leash = change.getLeash(); final SurfaceControl leash = change.getLeash();
final int mode = info.getChanges().get(i).getMode(); final int mode = change.getMode();
// Don't reparent anything that isn't independent within its parents // Don't reparent anything that isn't independent within its parents
if (!TransitionInfo.isIndependent(change, info)) { if (!TransitionInfo.isIndependent(change, info)) {
@@ -332,26 +333,31 @@ public class Transitions implements RemoteCallable<Transitions> {
t.setPosition(leash, change.getStartAbsBounds().left - info.getRootOffset().x, t.setPosition(leash, change.getStartAbsBounds().left - info.getRootOffset().x,
change.getStartAbsBounds().top - info.getRootOffset().y); change.getStartAbsBounds().top - info.getRootOffset().y);
} }
final int layer;
// Put all the OPEN/SHOW on top // Put all the OPEN/SHOW on top
if (mode == TRANSIT_OPEN || mode == TRANSIT_TO_FRONT) { if ((change.getFlags() & FLAG_IS_WALLPAPER) != 0) {
// Wallpaper is always at the bottom.
layer = 0;
} else if (mode == TRANSIT_OPEN || mode == TRANSIT_TO_FRONT) {
if (isOpening) { if (isOpening) {
// put on top // put on top
t.setLayer(leash, zSplitLine + info.getChanges().size() - i); layer = zSplitLine + numChanges - i;
} else { } else {
// put on bottom // put on bottom
t.setLayer(leash, zSplitLine - i); layer = zSplitLine - i;
} }
} else if (mode == TRANSIT_CLOSE || mode == TRANSIT_TO_BACK) { } else if (mode == TRANSIT_CLOSE || mode == TRANSIT_TO_BACK) {
if (isOpening) { if (isOpening) {
// put on bottom and leave visible // put on bottom and leave visible
t.setLayer(leash, zSplitLine - i); layer = zSplitLine - i;
} else { } else {
// put on top // put on top
t.setLayer(leash, zSplitLine + info.getChanges().size() - i); layer = zSplitLine + numChanges - i;
} }
} else { // CHANGE or other } else { // CHANGE or other
t.setLayer(leash, zSplitLine + info.getChanges().size() - i); layer = zSplitLine + numChanges - i;
} }
t.setLayer(leash, layer);
} }
} }