Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev
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;