OSDN Git Service

Ripple tint is now color
authorAlan Viverette <alanv@google.com>
Tue, 10 Jun 2014 00:48:30 +0000 (17:48 -0700)
committerAlan Viverette <alanv@google.com>
Tue, 10 Jun 2014 00:58:45 +0000 (00:58 +0000)
Change-Id: I8e7d514fef327a7d3e172d0faae2466d26bddb9d

res/drawable/dashboard_tile_background.xml
res/drawable/preference_highlight.xml
res/drawable/switchbar_background.xml

index f66ff23..2629cda 100644 (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>
 
index bbffe62..20c1a0f 100644 (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>
index d329b6b..ac340be 100644 (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>