diff options
| author | Alan Viverette <alanv@google.com> | 2016-04-13 17:19:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-13 17:19:05 +0000 |
| commit | a63d2db09978387b2bfdd849034dc73d43647ded (patch) | |
| tree | 78bad743a776aff437543ac60e47bceda7fedfa7 /core/java | |
| parent | 3fb1c81394f98b025b488774916b7580f9e31dab (diff) | |
| parent | 4d59b81c21761b9159b018e82581d4cdc15db986 (diff) | |
Merge "Fall back to setting the level of the entire progress drawable" into nyc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/ProgressBar.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java index e9fa26ce4658..9c9784b4adf8 100644 --- a/core/java/android/widget/ProgressBar.java +++ b/core/java/android/widget/ProgressBar.java @@ -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) { |