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
This commit is contained in:
Alan Viverette
2015-02-05 00:47:16 +00:00
committed by Android (Google) Code Review
parent 721a95784e ae12ee34f3
commit 80252a92e5
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, private synchronized void doRefreshProgress(int id, int progress, boolean fromUser,
boolean callBackToApp) { boolean callBackToApp) {
float scale = mMax > 0 ? (float) progress / (float) mMax : 0; float scale = mMax > 0 ? (float) progress / (float) mMax : 0;
final Drawable d = mCurrentDrawable; final Drawable d = mCurrentDrawable.getCurrent();
if (d != null) { if (d != null) {
Drawable progressDrawable = null; Drawable progressDrawable = null;