Fix user switcher ripple emanation point

Bug: 18444431
Change-Id: I35b053b151ba1e6e326d3a6c2bd2c3c8e3ad8c28

1 files changed, 9 insertions, 2 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSDetailClipper.java b/packages/SystemUI/src/com/android/systemui/qs/QSDetailClipper.java
index 111484b..a318efc 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSDetailClipper.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSDetailClipper.java
@@ -42,14 +42,21 @@ public class QSDetailClipper {
         }
         final int w = mDetail.getWidth() - x;
         final int h = mDetail.getHeight() - y;
+        int innerR = 0;
+        if (x < 0 || w < 0 || y < 0 || h < 0) {
+            innerR = Math.abs(x);
+            innerR = Math.min(innerR, Math.abs(y));
+            innerR = Math.min(innerR, Math.abs(w));
+            innerR = Math.min(innerR, Math.abs(h));
+        }
         int r = (int) Math.ceil(Math.sqrt(x * x + y * y));
         r = (int) Math.max(r, Math.ceil(Math.sqrt(w * w + y * y)));
         r = (int) Math.max(r, Math.ceil(Math.sqrt(w * w + h * h)));
         r = (int) Math.max(r, Math.ceil(Math.sqrt(x * x + h * h)));
         if (in) {
-            mAnimator = ViewAnimationUtils.createCircularReveal(mDetail, x, y, 0, r);
+            mAnimator = ViewAnimationUtils.createCircularReveal(mDetail, x, y, innerR, r);
         } else {
-            mAnimator = ViewAnimationUtils.createCircularReveal(mDetail, x, y, r, 0);
+            mAnimator = ViewAnimationUtils.createCircularReveal(mDetail, x, y, r, innerR);
         }
         mAnimator.setDuration((long)(mAnimator.getDuration() * 1.5));
         if (listener != null) {