Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove generics from Animator APIs"

Browse Source
This commit is contained in:
Romain Guy
2010-10-14 10:08:12 -07:00
committed by Android (Google) Code Review
parent c50a67b396 41f041d998
commit 70ea25fa8a
12 changed files with 1251 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/com/android/internal/widget/DrawableHolder.java
View File

@@ -41,8 +41,8 @@ public class DrawableHolder implements AnimatorListener {
private float mScaleY = 1.0f;
private BitmapDrawable mDrawable;
private float mAlpha = 1f;
private ArrayList<ObjectAnimator<Float>> mAnimators = new ArrayList<ObjectAnimator<Float>>();
private ArrayList<ObjectAnimator<Float>> mNeedToStart = new ArrayList<ObjectAnimator<Float>>();
private ArrayList<ObjectAnimator> mAnimators = new ArrayList<ObjectAnimator>();
private ArrayList<ObjectAnimator> mNeedToStart = new ArrayList<ObjectAnimator>();
public DrawableHolder(BitmapDrawable drawable) {
this(drawable, 0.0f, 0.0f);
@@ -67,12 +67,13 @@ public class DrawableHolder implements AnimatorListener {
* @param toValue the target value
* @param replace if true, replace the current animation with this one.
*/
public ObjectAnimator<Float> addAnimTo(long duration, long delay,
public ObjectAnimator addAnimTo(long duration, long delay,
String property, float toValue, boolean replace) {
if (replace) removeAnimationFor(property);
ObjectAnimator<Float> anim = new ObjectAnimator<Float>(duration, this, property, toValue);
ObjectAnimator anim = ObjectAnimator.ofFloat(this, property, toValue);
anim.setDuration(duration);
anim.setStartDelay(delay);
anim.setInterpolator(EASE_OUT_INTERPOLATOR);
this.addAnimation(anim, replace);
@@ -86,8 +87,8 @@ public class DrawableHolder implements AnimatorListener {
* @param property
*/
public void removeAnimationFor(String property) {
ArrayList<ObjectAnimator<Float>> removalList = new ArrayList<ObjectAnimator<Float>>();
for (ObjectAnimator<Float> currentAnim : mAnimators) {
ArrayList<ObjectAnimator> removalList = new ArrayList<ObjectAnimator>();
for (ObjectAnimator currentAnim : mAnimators) {
if (property.equals(currentAnim.getPropertyName())) {
currentAnim.cancel();
removalList.add(currentAnim);
@@ -101,7 +102,7 @@ public class DrawableHolder implements AnimatorListener {
* Stops all animations and removes them from the list.
*/
public void clearAnimations() {
for (ObjectAnimator<Float> currentAnim : mAnimators) {
for (ObjectAnimator currentAnim : mAnimators) {
currentAnim.cancel();
}
mAnimators.clear();
@@ -114,7 +115,7 @@ public class DrawableHolder implements AnimatorListener {
* @param overwrite
* @return
*/
private DrawableHolder addAnimation(ObjectAnimator<Float> anim, boolean overwrite) {
private DrawableHolder addAnimation(ObjectAnimator anim, boolean overwrite) {
if (anim != null)
mAnimators.add(anim);
mNeedToStart.add(anim);
@@ -148,7 +149,7 @@ public class DrawableHolder implements AnimatorListener {
*/
public void startAnimations(ValueAnimator.AnimatorUpdateListener listener) {
for (int i = 0; i < mNeedToStart.size(); i++) {
ObjectAnimator<Float> anim = mNeedToStart.get(i);
ObjectAnimator anim = mNeedToStart.get(i);
anim.addUpdateListener(listener);
anim.addListener(this);
anim.start();