| commit | bbe0dfcbb8bb76d296042f5d607d822eb72a514d | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Wed Jul 23 18:37:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 23 18:37:57 2014 +0000 |
| tree | 338d3583e05f005ee7a174167fadab26bf700494 | |
| parent | ba3f4c3bed0c5232c15a6de06b9beb5f59f0185d [diff] | |
| parent | 3f5c0f942f15bf4e2ce055eaa3084e04e0c68e09 [diff] |
am c4ddf36d: am b1e9a890: am cc379868: Merge "Ensure ripple mask gets updated in public constructor" into lmp-dev * commit 'c4ddf36d0cc7f66770ef4fe3277de5aceaccccd9': Ensure ripple mask gets updated in public constructor
diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java index 4a1d640..e23928c 100644 --- a/graphics/java/android/graphics/drawable/RippleDrawable.java +++ b/graphics/java/android/graphics/drawable/RippleDrawable.java
@@ -178,6 +178,7 @@ setColor(color); ensurePadding(); + initializeFromState(); } @Override