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

Commit a4eab42f authored by Alan Viverette's avatar Alan Viverette
Browse files

Change ripple tint to color, remove tintMode 

Also fixes double ripple on list preferences, missing ripple on up
button, and adds the Toolbar style to public. Further improves
ripple performance.

BUG: 15523923
BUG: 15473856
Change-Id: I5e8bf417368b60fcc33c80852e12f27b8c580774
parent 40e53cdc

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 Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->

-->





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

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

    android:tint="?attr/colorControlHighlight">

    android:color="?attr/colorControlHighlight">

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

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

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

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

</ripple>
 
</ripple>

core/res/res/drawable/btn_default_material.xml

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

-->





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

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

    android:tint="?attr/colorControlHighlight">

    android:color="?attr/colorControlHighlight">

    <item>

    <item>

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

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

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

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

core/res/res/drawable/btn_toggle_material.xml

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

    android:insetRight="4dp">

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

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

        <item>

        <item>

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

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

                <item>

                <item>

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

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

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

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

core/res/res/drawable/edit_text_material.xml

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

-->





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

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

    android:tint="?attr/colorControlActivated"

    android:color="?attr/colorControlActivated">

    android:tintMode="src_over">

    <item>

    <item>

        <selector>

        <selector>

            <item android:state_enabled="false">

            <item android:state_enabled="false">