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

* commit 'a29f3bbff43c33aedd028a852bfaf53325fe2538':
  Ripple tint is now color
This commit is contained in:
Alan Viverette
2014-06-11 13:07:56 +00:00
committed by Android Git Automerger
3 changed files with 5 additions and 10 deletions

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>