diff options
| author | Alan Viverette <alanv@google.com> | 2015-02-05 01:13:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-05 01:13:06 +0000 |
| commit | a638c44bfc6aeb4ba625b3e706a0d525bc0b2ff7 (patch) | |
| tree | 43a145b2c2ce7e35c941ed483c9a043054bf4ddc /core/java/android/widget/ProgressBar.java | |
| parent | f89e06fa58c08ff550a69b268832a2ea338b8700 (diff) | |
| parent | 80252a92e5736c62d26a7ee013c60c4fbfe4b66b (diff) | |
Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev
automerge: 80252a9
* commit '80252a92e5736c62d26a7ee013c60c4fbfe4b66b':
Allow top-level drawable container in progressDrawable
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; |