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

Merge "Put change type below closing type for a close transition" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-08 09:39:41 +00:00
committed by Android (Google) Code Review
parent ad693c128c 77e889f271
commit 6aecb91bd1
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -501,7 +501,9 @@ public class Transitions implements RemoteCallable<Transitions>,
*/ */
private static void setupAnimHierarchy(@NonNull TransitionInfo info, private static void setupAnimHierarchy(@NonNull TransitionInfo info,
@NonNull SurfaceControl.Transaction t, @NonNull SurfaceControl.Transaction finishT) { @NonNull SurfaceControl.Transaction t, @NonNull SurfaceControl.Transaction finishT) {
boolean isOpening = isOpeningType(info.getType()); final int type = info.getType();
final boolean isOpening = isOpeningType(type);
final boolean isClosing = isClosingType(type);
for (int i = 0; i < info.getRootCount(); ++i) { for (int i = 0; i < info.getRootCount(); ++i) {
t.show(info.getRoot(i).getLeash()); t.show(info.getRoot(i).getLeash());
} }
@@ -554,8 +556,14 @@ public class Transitions implements RemoteCallable<Transitions>,
layer = zSplitLine + numChanges - i; layer = zSplitLine + numChanges - i;
} }
} else { // CHANGE or other } else { // CHANGE or other
if (isClosing) {
// Put below CLOSE mode.
layer = zSplitLine - i;
} else {
// Put above CLOSE mode.
layer = zSplitLine + numChanges - i; layer = zSplitLine + numChanges - i;
} }
}
t.setLayer(leash, layer); t.setLayer(leash, layer);
} }
} }