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

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

Merge "Fall back to setting the level of the entire progress drawable" into nyc-dev 

am: a63d2db0

* commit 'a63d2db0':
  Fall back to setting the level of the entire progress drawable

Change-Id: I4f1c109fc925e9d576fca9d7db4de6a43c3eedee
parents 361124ef a63d2db0

core/java/android/widget/ProgressBar.java

+7 −0
Original line number Diff line number Diff line
@@ -1347,6 +1347,13 @@ public class ProgressBar extends View { 


        if (d instanceof LayerDrawable) {

            d = ((LayerDrawable) d).findDrawableByLayerId(id);

            if (d == null) {

                // If we can't find the requested layer, fall back to setting

                // the level of the entire drawable. This will break if

                // progress is set on multiple elements, but the theme-default

                // drawable will always have all layer IDs present.

                d = mCurrentDrawable;

            }

        }



        if (d != null) {