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

Commit c146277c authored Jul 31, 2024 by Robin Lee Committed by Android (Google) Code Review Jul 31, 2024

Merge "Revert "EdgeExtension: Add a missing flag check"" into main

parents 5b8c49ef 30f7116a

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

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -185,11 +185,8 @@ 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

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -513,8 +513,7 @@ 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);
	}		}