Merge "Merge "Fix the split divider position being shifted during animating"... (ea8fe2b6) · Commits · e / os / android_frameworks_base

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -170,6 +170,9 @@ public class TransitionUtil {
		if (isOpeningType(mode)) {
		t.setAlpha(leash, 0.f);
		}
		// Set the transition leash position to 0 in case the divider leash position being
		// taking down.
		t.setPosition(leash, 0, 0);
		t.setLayer(leash, Integer.MAX_VALUE);
		return;
		}
		@@ -228,7 +231,11 @@ public class TransitionUtil {
		t.reparent(change.getLeash(), leashSurface);
		t.setAlpha(change.getLeash(), 1.0f);
		t.show(change.getLeash());
		if (!isDividerBar(change)) {
		// For divider, don't modify its inner leash position when creating the outer leash
		// for the transition. In case the position being wrong after the transition finished.
		t.setPosition(change.getLeash(), 0, 0);
		}
		t.setLayer(change.getLeash(), 0);
		return leashSurface;
		}