diff options
| author | 2022-11-17 00:20:49 +0000 | |
|---|---|---|
| committer | 2022-11-17 00:20:49 +0000 | |
| commit | 94e790bd78d7f85c291db0fa3a682becbbbe5926 (patch) | |
| tree | 81390b05ebc321d06d4597e25285ac967f3aed00 | |
| parent | 4554dc578656c70c6c94b6c6ec960398c0e4ce79 (diff) | |
| parent | f20dcf55fc28bddd9aabd5a245ef4ff24039b439 (diff) | |
Merge "Fix ripple opacity to match the previous config." into tm-qpr-dev am: 6e3271fdb0 am: f20dcf55fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20474268
Change-Id: I1874bb14b2afb0b1df4c9fe5c83a4db343e8a713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/surfaceeffects/ripple/RippleAnimationConfig.kt | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/surfaceeffects/ripple/RippleView.kt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/surfaceeffects/ripple/RippleAnimationConfig.kt b/packages/SystemUI/src/com/android/systemui/surfaceeffects/ripple/RippleAnimationConfig.kt index ae73df201f8d..773ac55130d4 100644 --- a/packages/SystemUI/src/com/android/systemui/surfaceeffects/ripple/RippleAnimationConfig.kt +++ b/packages/SystemUI/src/com/android/systemui/surfaceeffects/ripple/RippleAnimationConfig.kt @@ -27,6 +27,6 @@ data class RippleAnimationConfig( companion object { const val RIPPLE_SPARKLE_STRENGTH: Float = 0.3f const val RIPPLE_DEFAULT_COLOR: Int = 0xffffffff.toInt() - const val RIPPLE_DEFAULT_ALPHA: Int = 45 // full opacity is 255. + const val RIPPLE_DEFAULT_ALPHA: Int = 115 // full opacity is 255. } } diff --git a/packages/SystemUI/src/com/android/systemui/surfaceeffects/ripple/RippleView.kt b/packages/SystemUI/src/com/android/systemui/surfaceeffects/ripple/RippleView.kt index 299469494295..2ad824348794 100644 --- a/packages/SystemUI/src/com/android/systemui/surfaceeffects/ripple/RippleView.kt +++ b/packages/SystemUI/src/com/android/systemui/surfaceeffects/ripple/RippleView.kt @@ -111,7 +111,7 @@ open class RippleView(context: Context?, attrs: AttributeSet?) : View(context, a /** * Set the color to be used for the ripple. * - * The alpha value of the color will be applied to the ripple. The alpha range is [0-100]. + * The alpha value of the color will be applied to the ripple. The alpha range is [0-255]. */ fun setColor(color: Int, alpha: Int = RippleAnimationConfig.RIPPLE_DEFAULT_ALPHA) { rippleShader.color = ColorUtils.setAlphaComponent(color, alpha) |