summaryrefslogtreecommitdiff
path: root/core/java/android/widget/ProgressBar.java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-02-04 17:15:01 -0800
committerAlan Viverette <alanv@google.com>2015-02-04 17:15:01 -0800
commitbac8e12ebd8ed143cd2f1974280f0495c837def4 (patch)
tree373edbcd8483f6d630c1375a6146f355dacc82c9 /core/java/android/widget/ProgressBar.java
parent81c80180311803d9faabc0bbd6c0813f44edcf7d (diff)
Move layer-list to be top-level element in seek bar progress
There is a bug in <scale>, but this works around it for now. Removes the previous fix, which broke the initial state due to the level not propagating when the current drawable was swapped out. Bug: 19269656 Change-Id: Ibe586ef4ea326a7ce7516ca42a369c5386c24359
Diffstat (limited to 'core/java/android/widget/ProgressBar.java')
-rw-r--r--core/java/android/widget/ProgressBar.java2
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;