Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e3271fd authored by Yein Jo's avatar Yein Jo Committed by Android (Google) Code Review
Browse files

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

parents 5a113c8c ce83d6a5

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

+1 −1
Original line number Diff line number Diff line
@@ -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.

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -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)