diff options
| author | Alan Viverette <alanv@google.com> | 2014-06-30 19:12:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-26 23:40:51 +0000 |
| commit | 7c800ddba8bda8d959805f64c44ae433a165cf09 (patch) | |
| tree | d626eb43ad6742afe7eb3a56cb35294fe06d9811 | |
| parent | 5b1662d4671d08fb9caccae09dd938fdb7bb2da8 (diff) | |
| parent | 6ae2d7cefafd7fbf5e7c8d7d3c1869e66056b7f8 (diff) | |
| download | frameworks_base-7c800ddba8bda8d959805f64c44ae433a165cf09.zip frameworks_base-7c800ddba8bda8d959805f64c44ae433a165cf09.tar.gz frameworks_base-7c800ddba8bda8d959805f64c44ae433a165cf09.tar.bz2 | |
Merge "Don't call deprecated RippleDrawable constructor"
| -rw-r--r-- | graphics/java/android/graphics/drawable/RippleDrawable.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java index 9bf7c43..be8df59 100644 --- a/graphics/java/android/graphics/drawable/RippleDrawable.java +++ b/graphics/java/android/graphics/drawable/RippleDrawable.java @@ -144,8 +144,11 @@ public class RippleDrawable extends LayerDrawable { /** Whether the hotspot is currently active (e.g. focused or pressed). */ private boolean mActive; + /** + * Constructor used for drawable inflation. + */ RippleDrawable() { - this(null, null); + this(new RippleState(null, null, null), null, null); } /** |