Merge "Move wallpaper transition leashes to the back" into udc-dev (f11d33ba) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/util/TransitionUtil.java

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -176,7 +176,14 @@ public class TransitionUtil {
	}		}

	// Put all the OPEN/SHOW on top		// 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) {		if (isOpening) {
	t.setLayer(leash, zSplitLine + info.getChanges().size() - layer);		t.setLayer(leash, zSplitLine + info.getChanges().size() - layer);
	if ((change.getFlags() & FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT) == 0) {		if ((change.getFlags() & FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT) == 0) {