Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alan Viverette
2016-04-13 17:19:03 +00:00
committed by Android (Google) Code Review
parent 3fb1c81394 4d59b81c21
commit a63d2db099
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/widget/ProgressBar.java
View File

@@ -1347,6 +1347,13 @@ public class ProgressBar extends View {
if (d instanceof LayerDrawable) { if (d instanceof LayerDrawable) {
d = ((LayerDrawable) d).findDrawableByLayerId(id); 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) { if (d != null) {