commit 80252a92e5736c62d26a7ee013c60c4fbfe4b66b
author Alan Viverette <alanv@google.com> Thu Feb 05 00:47:16 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 05 00:47:17 2015 +0000
tree 00a52cbcff1e9908a677ad09c54879f368321ddc
parent 721a95784eb646a1bf42debb68da0efddc8cad3d
parent ae12ee34f36226fce4de2314dbd69541d1a8863a

Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev

core/java/android/widget/ProgressBar.java

diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java
index de1bbc7..4d687cd 100644
--- a/core/java/android/widget/ProgressBar.java
+++ b/core/java/android/widget/ProgressBar.java
@@ -1241,7 +1241,7 @@
     private synchronized void doRefreshProgress(int id, int progress, boolean fromUser,
             boolean callBackToApp) {
         float scale = mMax > 0 ? (float) progress / (float) mMax : 0;
-        final Drawable d = mCurrentDrawable;
+        final Drawable d = mCurrentDrawable.getCurrent();
         if (d != null) {
             Drawable progressDrawable = null;