From 7d98c8fca6d1edd51178a65847687d81562d7d6e Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Tue, 24 May 2016 00:30:00 -0700
Subject: Adjust wallpaper picker to match static wallpaper picker

- Implement new action bar
- Use BottomSheet behavior from design lib
- Fill in values from live wallpaper if desired
- Don't use separate dialog for loading state

Bug: 28770685
Change-Id: I8dd862fe4c83f702e249f7f3644df89fee771f4f
---
 res/menu/menu_preview.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'res/menu')

diff --git a/res/menu/menu_preview.xml b/res/menu/menu_preview.xml
index 26adc2d..8ab2fb3 100644
--- a/res/menu/menu_preview.xml
+++ b/res/menu/menu_preview.xml
@@ -22,4 +22,9 @@
         android:showAsAction="ifRoom"
         android:title="@string/configure_wallpaper"/>
 
+    <item
+        android:id="@+id/set_wallpaper"
+        android:title="@string/set_live_wallpaper"
+        android:showAsAction="always|withText" />
+
 </menu>
-- 
cgit v1.2.3


From e230815d84309f0f4c8db576eb5e6bf467867ef7 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Wed, 10 Aug 2016 12:09:28 +0200
Subject: Use proper action bar item background

Bug: 22007160
Change-Id: I6b99f818b71addbccce09225e20932339fd88449
---
 res/menu/menu_preview.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'res/menu')

diff --git a/res/menu/menu_preview.xml b/res/menu/menu_preview.xml
index 8ab2fb3..471e506 100644
--- a/res/menu/menu_preview.xml
+++ b/res/menu/menu_preview.xml
@@ -25,6 +25,7 @@
     <item
         android:id="@+id/set_wallpaper"
         android:title="@string/set_live_wallpaper"
-        android:showAsAction="always|withText" />
+        android:showAsAction="always|withText"
+        android:actionLayout="@layout/set_wallpaper_action"/>
 
 </menu>
-- 
cgit v1.2.3