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 automerge: 80252a9

Browse Source 
automerge: a638c44

* commit 'a638c44bfc6aeb4ba625b3e706a0d525bc0b2ff7':
  Allow top-level drawable container in progressDrawable
This commit is contained in:
Alan Viverette
2015-02-05 02:39:32 +00:00
committed by android-build-merger
parent fcce8e1a82 a638c44bfc
commit c2bf7440ba
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;