Merge changes from topic "revert-20590670-animator_seeking-RVESPLGWYK" (f5e562ec) · Commits · e / os / android_frameworks_base

core/java/android/animation/Animator.java

+3 −30

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import android.compat.annotation.UnsupportedAppUsage;
		import android.content.pm.ActivityInfo.Config;
		import android.content.res.ConstantState;
		import android.os.Build;
		import android.util.LongArray;

		import java.util.ArrayList;

		@@ -547,6 +546,7 @@ public abstract class Animator implements Cloneable {
		*/
		void skipToEndValue(boolean inReverse) {}


		/**
		* Internal use only.
		*
		@@ -559,36 +559,9 @@ public abstract class Animator implements Cloneable {
		}

		/**
		* Internal use only. Changes the value of the animator as if currentPlayTime has passed since
		* the start of the animation. Therefore, currentPlayTime includes the start delay, and any
		* repetition. lastPlayTime is similar and is used to calculate how many repeats have been
		* done between the two times.
		*/
		void animateValuesInRange(long currentPlayTime, long lastPlayTime, boolean notify) {}

		/**
		* Internal use only. This animates any animation that has ended since lastPlayTime.
		* If an animation hasn't been finished, no change will be made.
		*/
		void animateSkipToEnds(long currentPlayTime, long lastPlayTime, boolean notify) {}

		/**
		* Internal use only. Adds all start times (after delay) to and end times to times.
		* The value must include offset.
		* Internal use only.
		*/
		void getStartAndEndTimes(LongArray times, long offset) {
		long startTime = offset + getStartDelay();
		if (times.indexOf(startTime) < 0) {
		times.add(startTime);
		}
		long duration = getTotalDuration();
		if (duration != DURATION_INFINITE) {
		long endTime = duration + offset;
		if (times.indexOf(endTime) < 0) {
		times.add(endTime);
		}
		}
		}
		void animateBasedOnPlayTime(long currentPlayTime, long lastPlayTime, boolean inReverse) {}

		/**
		* <p>An animation listener receives notifications from an animation.

core/java/android/animation/AnimatorSet.java

+109 −266

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/animation/ValueAnimator.java

+34 −84

File changed.

Preview size limit exceeded, changes collapsed.