commit c8e7e43a9df90bd2bdd823cdc61361427ecb4c4e
author Alan Viverette <alanv@google.com> Thu May 22 01:12:03 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 22 01:12:03 2014 +0000
tree 2c919ed4316504261d4aa46e029a558e30e3e026
parent 7b9134c229a1badf2e93ac6fe8f34efcdc5ba263
parent 36950406e6ffe6b1215ad6c60a75bbf0f0b92878

Merge "Update highlight attribute"

res/drawable/dashboard_tile_background.xml

diff --git a/res/drawable/dashboard_tile_background.xml b/res/drawable/dashboard_tile_background.xml
index 92b6f42..f66ff23 100644
--- a/res/drawable/dashboard_tile_background.xml
+++ b/res/drawable/dashboard_tile_background.xml
@@ -15,7 +15,7 @@
 -->
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-                android:tint="?android:attr/colorButtonPressed">
+                android:tint="?android:attr/colorControlHighlight">
     <item>
         <color android:color="@android:color/white" />
     </item>

res/drawable/preference_highlight.xml

diff --git a/res/drawable/preference_highlight.xml b/res/drawable/preference_highlight.xml
index 615a360..bbffe62 100644
--- a/res/drawable/preference_highlight.xml
+++ b/res/drawable/preference_highlight.xml
@@ -15,7 +15,7 @@
 -->
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-                android:tint="?android:attr/colorButtonPressed"
+                android:tint="?android:attr/colorControlHighlight"
                 android:pinned="true">
     <item android:id="@android:id/mask"
           android:drawable="@android:color/white" />