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

Commit 9d0bcc92 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Yet more alpha tweaks for Ripples"

parents 2eb5b2ab 96fccbe2

core/res/res/values/colors_material.xml

+3 −3
Original line number Original line 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_dark" format="float" type="dimen">.7</item>

    <item name="secondary_content_alpha_material_light" format="float" type="dimen">0.54</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_light" format="float" type="dimen">0.10</item>

    <item name="highlight_alpha_material_dark" format="float" type="dimen">0.16</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.16</item>

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





    <!-- Primary & accent colors -->

    <!-- Primary & accent colors -->

    <eat-comment />

    <eat-comment />

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

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

    }





    private void onStateChanged() {

    private void onStateChanged() {

        float newOpacity = 0.0f;

        // Hover             = .2 * alpha

        if (mHovered) newOpacity += .25f;

        // Focus             = .6 * alpha

        if (mFocused) newOpacity += .75f;

        // Focused + Hovered = .6 * alpha

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

        if (mAnimator != null) {

        if (mAnimator != null) {

            mAnimator.cancel();

            mAnimator.cancel();

            mAnimator = null;

            mAnimator = null;