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

Commit 9947787a authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am a29f3bbf: Merge "Ripple tint is now color" into lmp-preview-dev 

* commit 'a29f3bbf':
  Ripple tint is now color
parents c1846e0c a29f3bbf

res/drawable/dashboard_tile_background.xml

+2 −4
Original line number Diff line number Diff line
@@ -15,9 +15,7 @@ 
-->



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

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

    <item>

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

    </item>

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

    <item android:drawable="@android:color/white" />

</ripple>

res/drawable/preference_highlight.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="?android:attr/colorControlHighlight"

                android:pinned="true">

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

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

          android:drawable="@android:color/white" />

</ripple>

res/drawable/switchbar_background.xml

+2 −4
Original line number Diff line number Diff line
@@ -15,9 +15,7 @@ 
-->



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

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

    <item>

        <color android:color="@color/switchbar_background_color" />

    </item>

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

    <item android:drawable="@color/switchbar_background_color" />

</ripple>