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