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

Commit 38dc1b45 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

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

* commit 'cfbb4349520938aecc6bcfedab44f3ccd41e3b50':
  Ripple tint is now color
parents 7b00729a 1d6227f6

res-common/drawable/action_bar_tab.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"

    android:tint="@color/tab_pressed_color">

    <item>

        <ripple android:tint="@color/tab_pressed_color">

        <ripple android:color="@color/tab_pressed_color">

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

        </ripple>

    </item>

res-common/drawable/btn_dialpad_key.xml

+1 −2
Original line number Diff line number Diff line
@@ -15,5 +15,4 @@ 
-->



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

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

    android:pinned="true"/>
 
 No newline at end of file
 
    android:color="?android:attr/colorControlHighlight" />
 
 No newline at end of file