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

Commit c2bf7440 authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

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

automerge: a638c44b

* commit 'a638c44b':
  Allow top-level drawable container in progressDrawable
parents fcce8e1a a638c44b

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;