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

Commit 95483843 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Make sparkle color and alpha customizable 

This CL introduces a new attr: effectColor.
The attribute can be used on ripple tags to customize the color and
alpha of the ripple decoration.

It's also possible to change the effect color via code by invoking
RippleDrawable#setEffectColor.

Fixes: 185602477
Test: atest RippleDrawableTest
Change-Id: I9b50f330729a67ef4b529283a92c83c28387fa0b
parent 514f8b70

core/api/current.txt

+4 −1
Original line number Diff line number Diff line
@@ -592,6 +592,7 @@ package android { 
    field public static final int editTextStyle = 16842862; // 0x101006e

    field @Deprecated public static final int editable = 16843115; // 0x101016b

    field public static final int editorExtras = 16843300; // 0x1010224

    field public static final int effectColor;

    field public static final int elegantTextHeight = 16843869; // 0x101045d

    field public static final int elevation = 16843840; // 0x1010440

    field public static final int ellipsize = 16842923; // 0x10100ab
@@ -16817,8 +16818,10 @@ package android.graphics.drawable { 














  public class RippleDrawable extends android.graphics.drawable.LayerDrawable {















    ctor public RippleDrawable(@NonNull android.content.res.ColorStateList, @Nullable android.graphics.drawable.Drawable, @Nullable android.graphics.drawable.Drawable);













    method @NonNull public android.content.res.ColorStateList getEffectColor();















    method public int getRadius();













    method public void setColor(android.content.res.ColorStateList);













    method public void setColor(@NonNull android.content.res.ColorStateList);













    method public void setEffectColor(@NonNull android.content.res.ColorStateList);















    method public void setRadius(int);















    field public static final int RADIUS_AUTO = -1; // 0xffffffff















  }

























core/res/res/drawable/btn_borderless_material.xml



+1
−2




























Original line number
Diff line number
Diff line








@@ -15,8 +15,7 @@













-->































<ripple xmlns:android="http://schemas.android.com/apk/res/android"













        android:color="?attr/colorControlHighlight"













        android:rippleStyle="?attr/rippleStyle">













        android:color="?attr/colorControlHighlight">















    <item android:id="@id/mask"















          android:drawable="@drawable/btn_default_mtrl_shape" />















</ripple>
























core/res/res/drawable/btn_colored_material.xml



+1
−2




























Original line number
Diff line number
Diff line








@@ -19,8 +19,7 @@













       android:insetTop="@dimen/button_inset_vertical_material"















       android:insetRight="@dimen/button_inset_horizontal_material"















       android:insetBottom="@dimen/button_inset_vertical_material">













    <ripple android:color="?attr/colorControlHighlight"













            android:rippleStyle="?attr/rippleStyle">













    <ripple android:color="?attr/colorControlHighlight">















        <item>















            <shape android:shape="rectangle"















                   android:tint="@color/btn_colored_background_material">

































core/res/res/drawable/btn_default_material.xml



+1
−2




























Original line number
Diff line number
Diff line








@@ -15,7 +15,6 @@













-->































<ripple xmlns:android="http://schemas.android.com/apk/res/android"













        android:color="?attr/colorControlHighlight"













        android:rippleStyle="?attr/rippleStyle">













        android:color="?attr/colorControlHighlight">















    <item android:drawable="@drawable/btn_default_mtrl_shape" />















</ripple>
























core/res/res/drawable/btn_toggle_material.xml



+1
−2




























Original line number
Diff line number
Diff line








@@ -21,8 +21,7 @@













       android:insetBottom="@dimen/button_inset_vertical_material">















    <layer-list android:paddingMode="stack">















        <item>













            <ripple android:color="?attr/colorControlHighlight"













                android:rippleStyle="?attr/rippleStyle">













            <ripple android:color="?attr/colorControlHighlight">















                <item>















                    <shape android:shape="rectangle"















                           android:tint="?attr/colorButtonNormal">