commit 11e84ce024e763d16108e49e96f65657b70c7585
author Alan Viverette <alanv@google.com> Thu Aug 07 20:35:36 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 07 17:50:16 2014 +0000
tree d4f13be161e103963fdcf231f3ae653259c99f21
parent 47082b9c7ee11ce1d1fd266d715b5b30fb759f4a
parent 036a66596dba32c051a016ca9b5334fbbd39c220

Merge "Add an extra pixel to the ripple radius used for bounds" into lmp-dev

graphics/java/android/graphics/drawable/Ripple.java

diff --git a/graphics/java/android/graphics/drawable/Ripple.java b/graphics/java/android/graphics/drawable/Ripple.java
index 6f21f2e..be2241b 100644
--- a/graphics/java/android/graphics/drawable/Ripple.java
+++ b/graphics/java/android/graphics/drawable/Ripple.java
@@ -276,7 +276,7 @@
     public void getBounds(Rect bounds) {
         final int outerX = (int) mOuterX;
         final int outerY = (int) mOuterY;
-        final int r = (int) mOuterRadius;
+        final int r = (int) mOuterRadius + 1;
         bounds.set(outerX - r, outerY - r, outerX + r, outerY + r);
     }
 

graphics/java/android/graphics/drawable/RippleBackground.java

diff --git a/graphics/java/android/graphics/drawable/RippleBackground.java b/graphics/java/android/graphics/drawable/RippleBackground.java
index d404ccd..93df648 100644
--- a/graphics/java/android/graphics/drawable/RippleBackground.java
+++ b/graphics/java/android/graphics/drawable/RippleBackground.java
@@ -264,7 +264,7 @@
     public void getBounds(Rect bounds) {
         final int outerX = (int) mOuterX;
         final int outerY = (int) mOuterY;
-        final int r = (int) mOuterRadius;
+        final int r = (int) mOuterRadius + 1;
         bounds.set(outerX - r, outerY - r, outerX + r, outerY + r);
     }