Merge "Only set edge extension if no animation offset is set." into main (9360a40e) · Commits · e / os / android_frameworks_base

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -573,12 +573,6 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler {
		backgroundColorForTransition = getTransitionBackgroundColorIfSet(change, a,
		backgroundColorForTransition);

		if (!isTask && a.getExtensionEdges() != 0x0) {
		startTransaction.setEdgeExtensionEffect(
		change.getLeash(), a.getExtensionEdges());
		finishTransaction.setEdgeExtensionEffect(change.getLeash(), /* edge */ 0);
		}

		final Rect clipRect = TransitionUtil.isClosingType(mode)
		? new Rect(mRotator.getEndBoundsInStartRotation(change))
		: new Rect(change.getEndAbsBounds());
		@@ -597,6 +591,12 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler {
		animRelOffset.x = Math.max(animRelOffset.x, change.getEndRelOffset().x);
		animRelOffset.y = Math.max(animRelOffset.y, change.getEndRelOffset().y);
		}
		if (!isTask && a.getExtensionEdges() != 0x0
		&& animRelOffset.x == 0 && animRelOffset.y == 0) {
		startTransaction.setEdgeExtensionEffect(
		change.getLeash(), a.getExtensionEdges());
		finishTransaction.setEdgeExtensionEffect(change.getLeash(), /* edge */ 0);
		}

		if (isActivity && !isActivityLevel
		&& !mRotator.isRotated(change)) {