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

Commit 42caaa16 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix RippleDrawable alpha" into udc-dev am: 0814c2dd am:... 

Merge "Merge "Fix RippleDrawable alpha" into udc-dev am: 0814c2dd am: 10c7ddb6 am: c5d6fd4e" into udc-qpr-dev-plus-aosp
parents 37b241d3 c512150d

core/res/res/values/colors_material.xml

+3 −3
Original line number Diff line number Diff line
@@ -72,9 +72,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.60</item>



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

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

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

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

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

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



    <!-- Primary & accent colors -->

    <eat-comment />

graphics/java/android/graphics/drawable/RippleDrawable.java

+2 −1
Original line number Diff line number Diff line
@@ -1013,7 +1013,8 @@ public class RippleDrawable extends LayerDrawable { 
        }

        p.setShader(shader);

        p.setColorFilter(null);

        p.setColor(color);

        // Alpha is handled by the shader (and color is a no-op because there's a shader)

        p.setColor(0xFF000000);

        return properties;

    }