Merge "Fix hard edge on charging ripple." into sc-qpr1-dev am: 5c3bcacec0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15523929

Change-Id: Ibd6acd9f9e73c7c771e13a8ef82eaf133d72c9b3

packages/SystemUI/src/com/android/systemui/statusbar/charging/ChargingRippleView.kt

@@ -104,7 +104,7 @@ class ChargingRippleView(context: Context?, attrs: AttributeSet?) : View(context
         // the active effect area. Values here should be kept in sync with the
         // animation implementation in the ripple shader.
         val maskRadius = (1 - (1 - rippleShader.progress) * (1 - rippleShader.progress) *
-                (1 - rippleShader.progress)) * radius * 1.5f
+                (1 - rippleShader.progress)) * radius * 2
         canvas?.drawCircle(origin.x, origin.y, maskRadius, ripplePaint)
     }
 }