diff options
| author | Alan Viverette <alanv@google.com> | 2015-02-05 03:45:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-05 03:45:31 +0000 |
| commit | eeb69d171b4023e92fb729bf61d566540bdd5220 (patch) | |
| tree | 1510659fd020058cb707caecf26bb20822f0475a /core/java/android/widget/ProgressBar.java | |
| parent | 1350671f406c238439e1dc4378287bd422aaf636 (diff) | |
| parent | 6708ac40f29c2437d3cb67ffa7604aecbdad1fe7 (diff) | |
Move layer-list to be top-level element in seek bar progress automerge: bac8e12
automerge: 6708ac4
* commit '6708ac40f29c2437d3cb67ffa7604aecbdad1fe7':
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 4d687cd02d32..de1bbc7affad 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; |