diff options
| author | Alan Viverette <alanv@google.com> | 2015-02-05 03:50:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-05 03:50:28 +0000 |
| commit | 323d888b64eec7dcbfe1b9b0831df872ba463de3 (patch) | |
| tree | 9a397bd4fef22357082a51fd64fa97b7e5c0447e /core/java/android/widget/ProgressBar.java | |
| parent | d7c32e484364015e3965c6c090e1c223e14b3e2f (diff) | |
| parent | eeb69d171b4023e92fb729bf61d566540bdd5220 (diff) | |
am eeb69d17: Move layer-list to be top-level element in seek bar progress automerge: bac8e12 automerge: 6708ac4
* commit 'eeb69d171b4023e92fb729bf61d566540bdd5220':
Move layer-list to be top-level element in seek bar progress
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 7e159d946901..d32cb109bf42 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.getCurrent(); + final Drawable d = mCurrentDrawable; if (d != null) { Drawable progressDrawable = null; |