Merge "Provide vsync id for PiP animation" (72ced073) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.animation.RectEvaluator;
		import android.animation.ValueAnimator;
		import android.annotation.IntDef;
		import android.graphics.Rect;
		import android.view.Choreographer;
		import android.view.SurfaceControl;

		import com.android.internal.annotations.VisibleForTesting;
		@@ -327,8 +328,14 @@ public class PipAnimationController {
		mEndValue = endValue;
		}

		SurfaceControl.Transaction newSurfaceControlTransaction() {
		return mSurfaceControlTransactionFactory.getTransaction();
		/**
		* @return {@link SurfaceControl.Transaction} instance with vsync-id.
		*/
		protected SurfaceControl.Transaction newSurfaceControlTransaction() {
		final SurfaceControl.Transaction tx =
		mSurfaceControlTransactionFactory.getTransaction();
		tx.setFrameTimelineVsync(Choreographer.getSfInstance().getVsyncId());
		return tx;
		}

		@VisibleForTesting

+5 −0

Original line number	Diff line number	Diff line
		@@ -196,6 +196,11 @@ public class PipAnimationControllerTest extends ShellTestCase {
		return this;
		}

		@Override
		public SurfaceControl.Transaction setFrameTimelineVsync(long frameTimelineVsyncId) {
		return this;
		}

		@Override
		public void apply() {}
		}