diff options
| author | Alan Viverette <alanv@google.com> | 2015-02-04 16:44:02 -0800 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2015-02-04 16:44:02 -0800 |
| commit | ae12ee34f36226fce4de2314dbd69541d1a8863a (patch) | |
| tree | e78870fd906d39bc913afd15e1900f1c67d1be23 /core/java/android/widget/ProgressBar.java | |
| parent | d7310bd1499c0b48594a8fbbcbe0c7e80c1e5832 (diff) | |
Allow top-level drawable container in progressDrawable
Bug: 19269656
Change-Id: I82a49d1565f5c49320872f1489ce0f630ac85bd0
Diffstat (limited to 'core/java/android/widget/ProgressBar.java')
| -rw-r--r-- | core/java/android/widget/ProgressBar.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java index de1bbc7affad..4d687cd02d32 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; |