From ae12ee34f36226fce4de2314dbd69541d1a8863a Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Wed, 4 Feb 2015 16:44:02 -0800
Subject: [PATCH] Allow top-level drawable container in progressDrawable

Bug: 19269656
Change-Id: I82a49d1565f5c49320872f1489ce0f630ac85bd0
---
 core/java/android/widget/ProgressBar.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java
index de1bbc7affad1..4d687cd02d323 100644
--- a/core/java/android/widget/ProgressBar.java
+++ b/core/java/android/widget/ProgressBar.java
@@ -1241,7 +1241,7 @@ public class ProgressBar extends View {
     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;