resolved conflicts for merge of f7fb5331 to kraken

Change-Id: I61258dd7c7e52a6251c1d9499e113401ff375b20
2010-05-17 13:50:32 -07:00
parent eb8f850d0b f7fb5331e5
commit 9eb7a72253
1 changed files with 16 additions and 0 deletions
--- a/core/java/android/widget/ProgressBar.java
+++ b/core/java/android/widget/ProgressBar.java
@@ -947,4 +947,20 @@ public class ProgressBar extends View {
        setProgress(ss.progress);
        setSecondaryProgress(ss.secondaryProgress);
    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        if (mIndeterminate) {
+            startAnimation();
+        }
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        if (mIndeterminate) {
+            stopAnimation();
+        }
+    }
 }