Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33e7e423 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 80252a92: Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev 

* commit '80252a92':
  Allow top-level drawable container in progressDrawable
parents b1613a00 80252a92

core/java/android/widget/ProgressBar.java

+1 −1
Original line number Diff line number Diff line
@@ -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;