Merge "Ripple tint is now color" into lmp-preview-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
a29f3bbff4
@@ -15,9 +15,7 @@
|
|||||||
-->
|
-->
|
||||||
|
|
||||||
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
|
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:tint="?android:attr/colorControlHighlight">
|
android:color="?android:attr/colorControlHighlight">
|
||||||
<item>
|
<item android:drawable="@android:color/white" />
|
||||||
<color android:color="@android:color/white" />
|
|
||||||
</item>
|
|
||||||
</ripple>
|
</ripple>
|
||||||
|
|
||||||
|
@@ -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="?android:attr/colorControlHighlight"
|
android:color="?android:attr/colorControlHighlight">
|
||||||
android:pinned="true">
|
|
||||||
<item android:id="@android:id/mask"
|
<item android:id="@android:id/mask"
|
||||||
android:drawable="@android:color/white" />
|
android:drawable="@android:color/white" />
|
||||||
</ripple>
|
</ripple>
|
||||||
|
@@ -15,9 +15,7 @@
|
|||||||
-->
|
-->
|
||||||
|
|
||||||
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
|
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:tint="?android:attr/colorControlHighlight">
|
android:color="?android:attr/colorControlHighlight">
|
||||||
<item>
|
<item android:drawable="@color/switchbar_background_color" />
|
||||||
<color android:color="@color/switchbar_background_color" />
|
|
||||||
</item>
|
|
||||||
</ripple>
|
</ripple>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user