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

Commit 5eeb0d55 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Fix emphasized button drawable to avoid ripple shape glitch. 

Fixes: 191001646
Test: tap a button in the alarm notification
Change-Id: I3d8f77f96dc799bc36a44104874514c9320d11ce
parent 3ab0caf4

core/java/com/android/internal/widget/EmphasizedNotificationButton.java

+5 −4
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.internal.R; 
@RemoteViews.RemoteView

public class EmphasizedNotificationButton extends Button {

    private final RippleDrawable mRipple;

    private final GradientDrawable mBackground;

    private boolean mPriority;



    public EmphasizedNotificationButton(Context context) {
@@ -57,9 +58,10 @@ public class EmphasizedNotificationButton extends Button { 
    public EmphasizedNotificationButton(Context context, AttributeSet attrs, int defStyleAttr,

            int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);

        DrawableWrapper background = (DrawableWrapper) getBackground().mutate();

        mRipple = (RippleDrawable) background.getDrawable();

        mRipple = (RippleDrawable) getBackground();

        mRipple.mutate();

        DrawableWrapper inset = (DrawableWrapper) mRipple.getDrawable(0);

        mBackground = (GradientDrawable) inset.getDrawable();

    }



    @RemotableViewMethod
@@ -70,8 +72,7 @@ public class EmphasizedNotificationButton extends Button { 


    @RemotableViewMethod

    public void setButtonBackground(ColorStateList color) {

        GradientDrawable inner = (GradientDrawable) mRipple.getDrawable(0);

        inner.setColor(color);

        mBackground.setColor(color);

        invalidate();

    }

core/res/res/drawable/btn_notification_emphasized.xml

+10 −10
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ 
  ~ limitations under the License

  -->



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

<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?attr/colorControlHighlight">

    <item>

        <inset

            android:insetLeft="@dimen/button_inset_horizontal_material"

            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">

        <item>

            <shape android:shape="rectangle">

                <corners android:radius="@dimen/notification_action_button_radius" />

                <padding android:left="12dp"
@@ -30,6 +30,6 @@ 
                         android:bottom="@dimen/button_padding_vertical_material" />

                <solid android:color="@color/white" />

            </shape>

        </inset>

    </item>

</ripple>
 
</inset>