summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2009-06-30 12:39:18 -0700
committerRomain Guy <romainguy@android.com>2009-06-30 12:39:18 -0700
commitb5537c452271634b6ff3981b0624fa65384abd5b (patch)
tree66159c3caed7ad21c6afb61974b77278d32097aa /core/java/android/widget
parent2f8d58b7ae2b9dc60eed83e5dddc8c28223e1ede (diff)
downloadframeworks_base-b5537c452271634b6ff3981b0624fa65384abd5b.zip
frameworks_base-b5537c452271634b6ff3981b0624fa65384abd5b.tar.gz
frameworks_base-b5537c452271634b6ff3981b0624fa65384abd5b.tar.bz2
Replace indeterminate progress animated asset with new ones
Diffstat (limited to 'core/java/android/widget')
-rw-r--r--core/java/android/widget/ProgressBar.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java
index 441414a..2c9e71e 100644
--- a/core/java/android/widget/ProgressBar.java
+++ b/core/java/android/widget/ProgressBar.java
@@ -30,6 +30,7 @@ import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
import android.graphics.drawable.ShapeDrawable;
import android.graphics.drawable.StateListDrawable;
+import android.graphics.drawable.Animatable;
import android.graphics.drawable.shapes.RoundRectShape;
import android.graphics.drawable.shapes.Shape;
import android.util.AttributeSet;
@@ -683,7 +684,7 @@ public class ProgressBar extends View {
return;
}
- if (mIndeterminateDrawable instanceof AnimationDrawable) {
+ if (mIndeterminateDrawable instanceof Animatable) {
mShouldStartAnimationDrawable = true;
mAnimation = null;
} else {
@@ -708,8 +709,8 @@ public class ProgressBar extends View {
void stopAnimation() {
mAnimation = null;
mTransformation = null;
- if (mIndeterminateDrawable instanceof AnimationDrawable) {
- ((AnimationDrawable) mIndeterminateDrawable).stop();
+ if (mIndeterminateDrawable instanceof Animatable) {
+ ((Animatable) mIndeterminateDrawable).stop();
mShouldStartAnimationDrawable = false;
}
}
@@ -818,8 +819,8 @@ public class ProgressBar extends View {
}
d.draw(canvas);
canvas.restore();
- if (mShouldStartAnimationDrawable && d instanceof AnimationDrawable) {
- ((AnimationDrawable) d).start();
+ if (mShouldStartAnimationDrawable && d instanceof Animatable) {
+ ((Animatable) d).start();
mShouldStartAnimationDrawable = false;
}
}