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

Commit eb29d330 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Change ripple tint to color, remove tintMode" into lmp-preview-dev

parents 598622df a4eab42f

api/current.txt

+265 −261

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/drawable/btn_borderless_material.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->



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

    android:tint="?attr/colorControlHighlight">

    android:color="?attr/colorControlHighlight">

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

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

</ripple>

core/res/res/drawable/btn_default_material.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->



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

    android:tint="?attr/colorControlHighlight">

    android:color="?attr/colorControlHighlight">

    <item>

        <nine-patch android:src="@drawable/btn_mtrl_alpha"

            android:tint="?attr/colorButtonNormal" />

core/res/res/drawable/btn_toggle_material.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    android:insetRight="4dp">

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

        <item>

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

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

                <item>

                    <nine-patch android:src="@drawable/btn_toggle_mtrl_alpha"

                        android:tint="?attr/colorButtonNormal" />

core/res/res/drawable/edit_text_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:tint="?attr/colorControlActivated"

    android:tintMode="src_over">

    android:color="?attr/colorControlActivated">

    <item>

        <selector>

            <item android:state_enabled="false">