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/values/styles.xml | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

(limited to 'res/values/styles.xml')

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 01747e7..361d824 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -21,28 +21,24 @@
 
     <style name="LivePickerTheme" parent="@android:style/Theme.DeviceDefault.Settings" />
 
-    <style name="Preview" parent="@android:style/Theme.DeviceDefault">
-        <item name="android:actionBarStyle">@style/PreviewActionBar</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.Activity</item>
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowActionBarOverlay">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
+    <style name="Preview" parent="@style/Theme.AppCompat">
+
+        <!-- Set no title and no action bar because we use a toolbar instead. -->
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-    </style>
+        <item name="android:windowContentOverlay">@null</item>
 
-    <style name="PreviewActionBar" parent="@android:style/Widget.DeviceDefault.ActionBar">
-        <item name="android:displayOptions">showCustom</item>
-        <item name="android:background">#88000000</item>
-        <item name="android:contentInsetEnd">0dp</item>
-        <item name="android:contentInsetLeft">0dp</item>
-        <item name="android:contentInsetRight">0dp</item>
-        <item name="android:contentInsetStart">0dp</item>
+        <!-- Set status bar and navigation buttons to be translucent. -->
+        <item name="android:colorPrimaryDark">@color/translucent_black</item>
+        <item name="android:navigationBarColor">@color/translucent_black</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 name="TranslucentToolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
+        <item name="android:background">@color/translucent_black</item>
+        <item name="android:theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
     </style>
 
+    <style name="AttributionPaneTitle" parent="@android:style/TextAppearance.Material.Subhead"/>
+
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 2f8976bd3038c98382e656c0af7eb55b84a21baa Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Thu, 23 Jun 2016 14:09:00 -0700
Subject: Use device default accent color in live picker

Also don't use a preview window as the activity is translucent.

Bug: 28625050
Change-Id: Ia1f28a6d321a7bc9791f8308d2c84f5514725637
---
 res/values/styles.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'res/values/styles.xml')

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 361d824..ff942e2 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -32,6 +32,11 @@
         <!-- Set status bar and navigation buttons to be translucent. -->
         <item name="android:colorPrimaryDark">@color/translucent_black</item>
         <item name="android:navigationBarColor">@color/translucent_black</item>
+
+        <item name="colorAccent">@*android:color/accent_device_default_dark</item>
+
+        <item name="android:windowDisablePreview">true</item>
+
     </style>
 
     <style name="TranslucentToolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
-- 
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/values/styles.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'res/values/styles.xml')

diff --git a/res/values/styles.xml b/res/values/styles.xml
index ff942e2..c3dc2b3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -36,7 +36,6 @@
         <item name="colorAccent">@*android:color/accent_device_default_dark</item>
 
         <item name="android:windowDisablePreview">true</item>
-
     </style>
 
     <style name="TranslucentToolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
-- 
cgit v1.2.3