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

Commit 96fccbe2 authored by John Reck's avatar John Reck
Browse files

Yet more alpha tweaks for Ripples 

Change-Id: If714a90d847882e04863723e1849e12a8f987fac
Fixes: 72173993
Test: API demos controls tests, clicked stuff, mouse & kbd used.
parent 0f888de0

core/res/res/values/colors_material.xml

+3 −3
Original line number Diff line number Diff line
@@ -78,9 +78,9 @@ 
    <item name="secondary_content_alpha_material_dark" format="float" type="dimen">.7</item>

    <item name="secondary_content_alpha_material_light" format="float" type="dimen">0.54</item>



    <item name="highlight_alpha_material_light" format="float" type="dimen">0.16</item>

    <item name="highlight_alpha_material_dark" format="float" type="dimen">0.16</item>

    <item name="highlight_alpha_material_colored" format="float" type="dimen">0.16</item>

    <item name="highlight_alpha_material_light" format="float" type="dimen">0.10</item>

    <item name="highlight_alpha_material_dark" format="float" type="dimen">0.10</item>

    <item name="highlight_alpha_material_colored" format="float" type="dimen">0.10</item>



    <!-- Primary & accent colors -->

    <eat-comment />

graphics/java/android/graphics/drawable/RippleBackground.java

+4 −3
Original line number Diff line number Diff line
@@ -78,9 +78,10 @@ class RippleBackground extends RippleComponent { 
    }



    private void onStateChanged() {

        float newOpacity = 0.0f;

        if (mHovered) newOpacity += .25f;

        if (mFocused) newOpacity += .75f;

        // Hover             = .2 * alpha

        // Focus             = .6 * alpha

        // Focused + Hovered = .6 * alpha

        float newOpacity = mFocused ? .6f : mHovered ? .2f : 0f;

        if (mAnimator != null) {

            mAnimator.cancel();

            mAnimator = null;