Merge "Add TimeInterpolator support to RNA" (cae68731) · Commits · e / os / android_frameworks_base

core/java/android/util/TimeUtils.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -245,6 +245,9 @@ public class TimeUtils {
		private static final int SECONDS_PER_HOUR = 60 * 60;
		private static final int SECONDS_PER_DAY = 24 * 60 * 60;

		/** @hide */
		public static final long NANOS_PER_MS = 1000000;

		private static final Object sFormatSync = new Object();
		private static char[] sFormatStr = new char[HUNDRED_DAY_FIELD_LEN+5];

core/java/android/view/Choreographer.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -112,8 +112,6 @@ public final class Choreographer {
		private static final int SKIPPED_FRAME_WARNING_LIMIT = SystemProperties.getInt(
		"debug.choreographer.skipwarning", 30);

		private static final long NANOS_PER_MS = 1000000;

		private static final int MSG_DO_FRAME = 0;
		private static final int MSG_DO_SCHEDULE_VSYNC = 1;
		private static final int MSG_DO_SCHEDULE_CALLBACK = 2;
		@@ -263,7 +261,7 @@ public final class Choreographer {
		* @return The refresh rate as the nanoseconds between frames
		* @hide
		*/
		long getFrameIntervalNanos() {
		public long getFrameIntervalNanos() {
		return mFrameIntervalNanos;
		}

		@@ -456,7 +454,7 @@ public final class Choreographer {
		* @hide
		*/
		public long getFrameTime() {
		return getFrameTimeNanos() / NANOS_PER_MS;
		return getFrameTimeNanos() / TimeUtils.NANOS_PER_MS;
		}

		/**
		@@ -497,7 +495,7 @@ public final class Choreographer {
		}
		} else {
		final long nextFrameTime = Math.max(
		mLastFrameTimeNanos / NANOS_PER_MS + sFrameDelay, now);
		mLastFrameTimeNanos / TimeUtils.NANOS_PER_MS + sFrameDelay, now);
		if (DEBUG) {
		Log.d(TAG, "Scheduling next frame in " + (nextFrameTime - now) + " ms.");
		}
		@@ -746,7 +744,7 @@ public final class Choreographer {
		mFrame = frame;
		Message msg = Message.obtain(mHandler, this);
		msg.setAsynchronous(true);
		mHandler.sendMessageAtTime(msg, timestampNanos / NANOS_PER_MS);
		mHandler.sendMessageAtTime(msg, timestampNanos / TimeUtils.NANOS_PER_MS);
		}

		@Override

core/java/android/view/RenderNodeAnimator.java

+48 −5

Original line number	Diff line number	Diff line
		@@ -16,12 +16,17 @@

		package android.view;

		import android.animation.TimeInterpolator;
		import android.graphics.Canvas;
		import android.graphics.CanvasProperty;
		import android.graphics.Paint;
		import android.util.SparseIntArray;
		import android.util.TimeUtils;

		import com.android.internal.util.VirtualRefBasePtr;
		import com.android.internal.view.animation.FallbackLUTInterpolator;
		import com.android.internal.view.animation.HasNativeInterpolator;
		import com.android.internal.view.animation.NativeInterpolatorFactory;

		import java.lang.ref.WeakReference;

		@@ -71,9 +76,12 @@ public final class RenderNodeAnimator {
		public static final int DELTA_TYPE_ABSOLUTE = 0;
		public static final int DELTA_TYPE_DELTA = 1;

		private RenderNode mTarget;
		private VirtualRefBasePtr mNativePtr;

		private RenderNode mTarget;
		private TimeInterpolator mInterpolator;
		private boolean mStarted = false;

		public int mapViewPropertyToRenderProperty(int viewProperty) {
		return sViewPropertyAnimatorMap.get(viewProperty);
		}
		@@ -100,9 +108,37 @@ public final class RenderNodeAnimator {
		mNativePtr = new VirtualRefBasePtr(ptr);
		}

		public void start(View target) {
		mTarget = target.mRenderNode;
		private void checkMutable() {
		if (mStarted) {
		throw new IllegalStateException("Animator has already started, cannot change it now!");
		}
		}

		private void applyInterpolator() {
		if (mInterpolator == null) return;

		long ni;
		if (mInterpolator.getClass().isAnnotationPresent(HasNativeInterpolator.class)) {
		ni = ((NativeInterpolatorFactory)mInterpolator).createNativeInterpolator();
		} else {
		int duration = nGetDuration(mNativePtr.get());
		ni = FallbackLUTInterpolator.createNativeInterpolator(mInterpolator, duration);
		}
		nSetInterpolator(mNativePtr.get(), ni);
		}

		private void start(RenderNode node) {
		if (mStarted) {
		throw new IllegalStateException("Already started!");
		}
		mStarted = true;
		applyInterpolator();
		mTarget = node;
		mTarget.addAnimator(this);
		}

		public void start(View target) {
		start(target.mRenderNode);
		// Kick off a frame to start the process
		target.invalidateViewProperty(true, false);
		}
		@@ -112,8 +148,7 @@ public final class RenderNodeAnimator {
		throw new IllegalArgumentException("Not a GLES20RecordingCanvas");
		}
		GLES20RecordingCanvas recordingCanvas = (GLES20RecordingCanvas) canvas;
		mTarget = recordingCanvas.mNode;
		mTarget.addAnimator(this);
		start(recordingCanvas.mNode);
		}

		public void cancel() {
		@@ -121,9 +156,15 @@ public final class RenderNodeAnimator {
		}

		public void setDuration(int duration) {
		checkMutable();
		nSetDuration(mNativePtr.get(), duration);
		}

		public void setInterpolator(TimeInterpolator interpolator) {
		checkMutable();
		mInterpolator = interpolator;
		}

		long getNativeAnimator() {
		return mNativePtr.get();
		}
		@@ -147,4 +188,6 @@ public final class RenderNodeAnimator {
		private static native long nCreateCanvasPropertyPaintAnimator(WeakReference<RenderNodeAnimator> weakThis,
		long canvasProperty, int paintField, int deltaValueType, float deltaValue);
		private static native void nSetDuration(long nativePtr, int duration);
		private static native int nGetDuration(long nativePtr);
		private static native void nSetInterpolator(long animPtr, long interpolatorPtr);
		}

core/java/android/view/ThreadedRenderer.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.graphics.Bitmap;
		import android.graphics.Rect;
		import android.graphics.SurfaceTexture;
		import android.os.Trace;
		import android.util.TimeUtils;
		import android.view.Surface.OutOfResourcesException;
		import android.view.View.AttachInfo;

		@@ -51,8 +52,6 @@ public class ThreadedRenderer extends HardwareRenderer {

		private static final Rect NULL_RECT = new Rect();

		private static final long NANOS_PER_MS = 1000000;

		// Keep in sync with DrawFrameTask.h SYNC_* flags
		// Nothing interesting to report
		private static final int SYNC_OK = 0x0;
		@@ -203,7 +202,7 @@ public class ThreadedRenderer extends HardwareRenderer {
		void draw(View view, AttachInfo attachInfo, HardwareDrawCallbacks callbacks, Rect dirty) {
		attachInfo.mIgnoreDirtyState = true;
		long frameTimeNanos = mChoreographer.getFrameTimeNanos();
		attachInfo.mDrawingTime = frameTimeNanos / NANOS_PER_MS;
		attachInfo.mDrawingTime = frameTimeNanos / TimeUtils.NANOS_PER_MS;

		updateRootDisplayList(view, callbacks);

core/java/android/view/animation/AccelerateDecelerateInterpolator.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -19,12 +19,17 @@ package android.view.animation;
		import android.content.Context;
		import android.util.AttributeSet;

		import com.android.internal.view.animation.HasNativeInterpolator;
		import com.android.internal.view.animation.NativeInterpolatorFactory;
		import com.android.internal.view.animation.NativeInterpolatorFactoryHelper;

		/**
		* An interpolator where the rate of change starts and ends slowly but
		* accelerates through the middle.
		*
		*/
		public class AccelerateDecelerateInterpolator implements Interpolator {
		@HasNativeInterpolator
		public class AccelerateDecelerateInterpolator implements Interpolator, NativeInterpolatorFactory {
		public AccelerateDecelerateInterpolator() {
		}

		@@ -35,4 +40,10 @@ public class AccelerateDecelerateInterpolator implements Interpolator {
		public float getInterpolation(float input) {
		return (float)(Math.cos((input + 1) * Math.PI) / 2.0f) + 0.5f;
		}

		/** @hide */
		@Override
		public long createNativeInterpolator() {
		return NativeInterpolatorFactoryHelper.createAccelerateDecelerateInterpolator();
		}
		}