diff options
| author | Alan Viverette <alanv@google.com> | 2015-02-06 00:53:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-06 00:53:09 +0000 |
| commit | cbe32de4544bbd8a4a360949dc2535eeeb0e21ff (patch) | |
| tree | 27db44fd6887da439e75c8b98e8fe25c3f86381f /core/java/android/view | |
| parent | 96f3462958977a29aeb8acf102dd5e86c4a5417a (diff) | |
| parent | 80b381c0736c1af43801b8ed26428abdf4d437b3 (diff) | |
| download | frameworks_base-cbe32de4544bbd8a4a360949dc2535eeeb0e21ff.zip frameworks_base-cbe32de4544bbd8a4a360949dc2535eeeb0e21ff.tar.gz frameworks_base-cbe32de4544bbd8a4a360949dc2535eeeb0e21ff.tar.bz2 | |
am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev
automerge: 80b381c
* commit '80b381c0736c1af43801b8ed26428abdf4d437b3':
Mutate scroll bar drawables
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/View.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 6928b2c..e4a8978 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -12872,7 +12872,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Interpolator.Result.FREEZE_END) { cache.state = ScrollabilityCache.OFF; } else { - cache.scrollBar.setAlpha(Math.round(values[0])); + cache.scrollBar.mutate().setAlpha(Math.round(values[0])); } // This will make the scroll bars inval themselves after @@ -12882,7 +12882,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } else { // We're just on -- but we may have been fading before so // reset alpha - cache.scrollBar.setAlpha(255); + cache.scrollBar.mutate().setAlpha(255); } |