commit b9c13d091efde4865ed5cfaf1c5a17b0bb17a38e
author Justin Ho <justinho@google.com> Thu Sep 29 08:58:50 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 29 08:58:50 2011 -0700
tree 453d53650dd674bdb570637adb8c840deebf8fbf
parent 253f694981592a99efc68799bedb073ac3fb0e30
parent aebd1e0823f64052f432754a09483d8fbc604c9a

Merge "Re-adding missing lockscreen drawable"

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();