Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev

Browse Source 
automerge: 80252a9

* commit '80252a92e5736c62d26a7ee013c60c4fbfe4b66b':
  Allow top-level drawable container in progressDrawable
This commit is contained in:
Alan Viverette
2015-02-05 01:13:06 +00:00
committed by android-build-merger
parent f89e06fa58 80252a92e5
commit a638c44bfc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/widget/ProgressBar.java
View File

@@ -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;