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 am: 6aecb91bd1

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

Change-Id: Iaefee7856b00e6761a1c213932a94498ce29adbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-08 10:18:21 +00:00
committed by Automerger Merge Worker
parent 3bc1119fb1 6aecb91bd1
commit c0c07e51e3
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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,7 +556,13 @@ public class Transitions implements RemoteCallable<Transitions>,
layer = zSplitLine + numChanges - i; layer = zSplitLine + numChanges - i;
} }
} else { // CHANGE or other } else { // CHANGE or other
layer = zSplitLine + numChanges - i; if (isClosing) {
// Put below CLOSE mode.
layer = zSplitLine - i;
} else {
// Put above CLOSE mode.
layer = zSplitLine + numChanges - i;
}
} }
t.setLayer(leash, layer); t.setLayer(leash, layer);
} }