Merge "Put change type below closing type for a close transition" into udc-dev (6aecb91b) · Commits · e / os / android_frameworks_base

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

+10 −2

Original line number	Diff line number	Diff line
		@@ -501,7 +501,9 @@ public class Transitions implements RemoteCallable<Transitions>,
		*/
		private static void setupAnimHierarchy(@NonNull TransitionInfo info,
		@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) {
		t.show(info.getRoot(i).getLeash());
		}
		@@ -554,8 +556,14 @@ public class Transitions implements RemoteCallable<Transitions>,
		layer = zSplitLine + numChanges - i;
		}
		} else { // CHANGE or other
		if (isClosing) {
		// Put below CLOSE mode.
		layer = zSplitLine - i;
		} else {
		// Put above CLOSE mode.
		layer = zSplitLine + numChanges - i;
		}
		}
		t.setLayer(leash, layer);
		}
		}