commit 01d4ffdef43f68e0ed4e99861a637e23fda8b4fc
author Winson Chung <winsonc@google.com> Tue Jun 23 21:55:52 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 23 21:55:53 2015 +0000
tree 5950343abc0a5474d6ddc31dd5d825ff2318bac4
parent 5d9200f92141f157fe6ae30106ee4b644d5ebd7e
parent b1777447d9b9700b48f8060f8b318f2363c43e8d

Merge "Refactoring fast scroller." into ub-launcher3-burnaby

WallpaperPicker/res/values-v21/styles.xml

diff --git a/WallpaperPicker/res/values-v21/styles.xml b/WallpaperPicker/res/values-v21/styles.xml
index 04f39de..582ab8f 100644
--- a/WallpaperPicker/res/values-v21/styles.xml
+++ b/WallpaperPicker/res/values-v21/styles.xml
@@ -28,4 +28,9 @@
         <item name="android:contentInsetStart">0dp</item>
     </style>
 
+    <style name="ActionBarSetWallpaperStyle" parent="@android:style/Widget.DeviceDefault.ActionButton">
+        <item name="android:textColor">#ffffffff</item>
+        <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
+    </style>
+
 </resources>
\ No newline at end of file

WallpaperPicker/res/values/styles.xml

diff --git a/WallpaperPicker/res/values/styles.xml b/WallpaperPicker/res/values/styles.xml
index f4008f1..74aeab9 100644
--- a/WallpaperPicker/res/values/styles.xml
+++ b/WallpaperPicker/res/values/styles.xml
@@ -17,7 +17,7 @@
 */
 -->
 
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="Theme.WallpaperCropper" parent="@android:style/Theme.DeviceDefault">
         <item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>
         <item name="android:windowFullscreen">true</item>
@@ -40,5 +40,6 @@
 
     <style name="ActionBarSetWallpaperStyle" parent="@android:style/Widget.DeviceDefault.ActionButton">
         <item name="android:textColor">#ffffffff</item>
+        <item name="android:background">?android:attr/selectableItemBackground</item>
     </style>
 </resources>