commit 253f694981592a99efc68799bedb073ac3fb0e30
author Chet Haase <chet@google.com> Thu Sep 29 07:47:16 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 29 07:47:16 2011 -0700
tree 81573bedd2751f4131c43c3f05aca10a586ee9c1
parent 29af07443607b21c943c9adc0ffb34331135ad3e
parent a79803c0924836053a6f97cc0e73f7ad56f763bd

Merge "Fixed ProgressBar logic for AnimationDrawables"

core/java/android/widget/ProgressBar.java

diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java
index e033d2d..df88fec 100644
--- a/core/java/android/widget/ProgressBar.java
+++ b/core/java/android/widget/ProgressBar.java
@@ -937,7 +937,8 @@
         int left = 0;
 
         if (mIndeterminateDrawable != null) {
-            if (mOnlyIndeterminate) {
+            // Aspect ratio logic does not apply to AnimationDrawables
+            if (mOnlyIndeterminate && !(mIndeterminateDrawable instanceof AnimationDrawable)) {
                 // Maintain aspect ratio. Certain kinds of animated drawables
                 // get very confused otherwise.
                 final int intrinsicWidth = mIndeterminateDrawable.getIntrinsicWidth();