Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix ripple opacity to match the previous config." into tm-qpr-dev

Browse Source
This commit is contained in:
Yein Jo
2022-11-16 23:46:52 +00:00
committed by Android (Google) Code Review
parent 5a113c8c94 ce83d6a5d6
commit 6e3271fdb0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/surfaceeffects/ripple/RippleAnimationConfig.kt
View File

@@ -27,6 +27,6 @@ data class RippleAnimationConfig(
companion object { companion object {
const val RIPPLE_SPARKLE_STRENGTH: Float = 0.3f const val RIPPLE_SPARKLE_STRENGTH: Float = 0.3f
const val RIPPLE_DEFAULT_COLOR: Int = 0xffffffff.toInt() 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.
} }
} }

2
packages/SystemUI/src/com/android/systemui/surfaceeffects/ripple/RippleView.kt
View File

@@ -111,7 +111,7 @@ open class RippleView(context: Context?, attrs: AttributeSet?) : View(context, a
/** /**
* Set the color to be used for the ripple. * 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) { fun setColor(color: Int, alpha: Int = RippleAnimationConfig.RIPPLE_DEFAULT_ALPHA) {
rippleShader.color = ColorUtils.setAlphaComponent(color, alpha) rippleShader.color = ColorUtils.setAlphaComponent(color, alpha)