Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d15a6f8f authored Jul 30, 2024 by Robin Lee

EdgeExtension: Add a missing flag check

This was missed when rebasing a work in progress patch.

Change-Id: Ie85d55f85e9af47fe175a172e6eb1a12c22eb6c8
Test: atest ActivityTransitionTests
Flag: com.android.graphics.libgui.flags.edge_extension_shader
Bug: 355860613

parent 7ef1ce6e

libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationAdapter.java

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -185,8 +185,11 @@ class ActivityEmbeddingAnimationAdapter {
	@CallSuper		@CallSuper
	void onAnimationEnd(@NonNull SurfaceControl.Transaction t) {		void onAnimationEnd(@NonNull SurfaceControl.Transaction t) {
	onAnimationUpdate(t, mAnimation.getDuration());		onAnimationUpdate(t, mAnimation.getDuration());
			if (com.android.graphics.libgui.flags.Flags.edgeExtensionShader()
			&& mAnimation.getExtensionEdges() != 0) {
	t.setEdgeExtensionEffect(mLeash, /* edge */ 0);		t.setEdgeExtensionEffect(mLeash, /* edge */ 0);
	}		}
			}

	final long getDurationHint() {		final long getDurationHint() {
	return mAnimation.computeDurationHint();		return mAnimation.computeDurationHint();

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -513,7 +513,8 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler {
	postStartTransactionCallbacks		postStartTransactionCallbacks
	.add(t -> edgeExtendWindow(change, a, t, finishTransaction));		.add(t -> edgeExtendWindow(change, a, t, finishTransaction));
	}		}
	} else if (com.android.graphics.libgui.flags.Flags.edgeExtensionShader()) {		} else if (com.android.graphics.libgui.flags.Flags.edgeExtensionShader()
			&& a.getExtensionEdges() != 0) {
	finishTransaction.setEdgeExtensionEffect(change.getLeash(), /* edge */ 0);		finishTransaction.setEdgeExtensionEffect(change.getLeash(), /* edge */ 0);
	}		}