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

Commit 2e36a166 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23331504



Change-Id: I74ca9455f2f1da0f06a2d22a608ccd1e5eb8e77d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6e41e384 0814c2dd

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;

    }