diff options
| author | Alan Viverette <alanv@google.com> | 2015-02-05 02:53:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-05 02:53:52 +0000 |
| commit | 77ad055957aa0ed442301fa2baf0636712a53d62 (patch) | |
| tree | 2ff65f5f10e234a3d40518147958de2e0f936863 | |
| parent | 29d267c7b35c902316277cb8d26e63dbe65a7334 (diff) | |
| parent | c2bf7440ba9e3484d37d9c5df2ef02710682b7ed (diff) | |
| download | frameworks_base-77ad055957aa0ed442301fa2baf0636712a53d62.zip frameworks_base-77ad055957aa0ed442301fa2baf0636712a53d62.tar.gz frameworks_base-77ad055957aa0ed442301fa2baf0636712a53d62.tar.bz2 | |
am c2bf7440: Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev automerge: 80252a9 automerge: a638c44
* commit 'c2bf7440ba9e3484d37d9c5df2ef02710682b7ed':
Allow top-level drawable container in progressDrawable
| -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 d32cb10..7e159d9 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; |