Merge "Remove obsolete DoubleEvaluator" into honeycomb (598913a6) · Commits · e / os / android_frameworks_base

api/11.xml

+0 −36

Original line number	Diff line number	Diff line
		@@ -20082,42 +20082,6 @@
		</parameter>
		</method>
		</class>
		<class name="DoubleEvaluator"
		extends="java.lang.Object"
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<implements name="android.animation.TypeEvaluator">
		</implements>
		<constructor name="DoubleEvaluator"
		type="android.animation.DoubleEvaluator"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</constructor>
		<method name="evaluate"
		return="java.lang.Object"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="fraction" type="float">
		</parameter>
		<parameter name="startValue" type="java.lang.Object">
		</parameter>
		<parameter name="endValue" type="java.lang.Object">
		</parameter>
		</method>
		</class>
		<class name="FloatEvaluator"
		extends="java.lang.Object"
		abstract="false"

api/current.xml

+1 −37

Original line number	Diff line number	Diff line
		@@ -20115,42 +20115,6 @@
		</parameter>
		</method>
		</class>
		<class name="DoubleEvaluator"
		extends="java.lang.Object"
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<implements name="android.animation.TypeEvaluator">
		</implements>
		<constructor name="DoubleEvaluator"
		type="android.animation.DoubleEvaluator"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</constructor>
		<method name="evaluate"
		return="java.lang.Object"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="fraction" type="float">
		</parameter>
		<parameter name="startValue" type="java.lang.Object">
		</parameter>
		<parameter name="endValue" type="java.lang.Object">
		</parameter>
		</method>
		</class>
		<class name="FloatEvaluator"
		extends="java.lang.Object"
		abstract="false"
		@@ -260264,7 +260228,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="arg0" type="T">
		<parameter name="t" type="T">
		</parameter>
		</method>
		</interface>

core/java/android/animation/DoubleEvaluator.java

deleted100644 → 0

+0 −42

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.animation;

		/**
		* This evaluator can be used to perform type interpolation between <code>double</code> values.
		*/
		public class DoubleEvaluator implements TypeEvaluator {
		/**
		* This function returns the result of linearly interpolating the start and end values, with
		* <code>fraction</code> representing the proportion between the start and end values. The
		* calculation is a simple parametric calculation: <code>result = x0 + t * (v1 - v0)</code>,
		* where <code>x0</code> is <code>startValue</code>, <code>x1</code> is <code>endValue</code>,
		* and <code>t</code> is <code>fraction</code>.
		*
		* @param fraction The fraction from the starting to the ending values
		* @param startValue The start value; should be of type <code>double</code> or
		* <code>Double</code>
		* @param endValue The end value; should be of type <code>double</code> or
		* <code>Double</code>
		* @return A linear interpolation between the start and end values, given the
		* <code>fraction</code> parameter.
		*/
		public Object evaluate(float fraction, Object startValue, Object endValue) {
		double startDouble = ((Number) startValue).doubleValue();
		return startDouble + fraction * (((Number) endValue).doubleValue() - startDouble);
		}
		}
		No newline at end of file

core/java/android/animation/FloatKeyframeSet.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,8 +25,8 @@ import java.util.ArrayList;
		* values between those keyframes for a given animation. The class internal to the animation
		* package because it is an implementation detail of how Keyframes are stored and used.
		*
		* <p>This type-specific subclass of KeyframeSet, along with the other type-specific subclasses for
		* int, long, and double, exists to speed up the getValue() method when there is no custom
		* <p>This type-specific subclass of KeyframeSet, along with the other type-specific subclass for
		* int, exists to speed up the getValue() method when there is no custom
		* TypeEvaluator set for the animation, so that values can be calculated without autoboxing to the
		* Object equivalents of these primitive types.</p>
		*/

core/java/android/animation/IntKeyframeSet.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,8 +25,8 @@ import java.util.ArrayList;
		* values between those keyframes for a given animation. The class internal to the animation
		* package because it is an implementation detail of how Keyframes are stored and used.
		*
		* <p>This type-specific subclass of KeyframeSet, along with the other type-specific subclasses for
		* float, long, and double, exists to speed up the getValue() method when there is no custom
		* <p>This type-specific subclass of KeyframeSet, along with the other type-specific subclass for
		* float, exists to speed up the getValue() method when there is no custom
		* TypeEvaluator set for the animation, so that values can be calculated without autoboxing to the
		* Object equivalents of these primitive types.</p>
		*/