summaryrefslogtreecommitdiffstats
path: root/res/values/styles.xml
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2016-05-24 00:30:00 -0700
committerJorim Jaggi <jjaggi@google.com>2016-06-02 19:09:51 -0700
commit7d98c8fca6d1edd51178a65847687d81562d7d6e (patch)
treecc8136cfcfb660fb73c026faf9bd1b514fa984fc /res/values/styles.xml
parentb30b95f9db068faf294e43fb7927d911ecfaf892 (diff)
downloadandroid_packages_wallpapers_LivePicker-7d98c8fca6d1edd51178a65847687d81562d7d6e.tar.gz
android_packages_wallpapers_LivePicker-7d98c8fca6d1edd51178a65847687d81562d7d6e.tar.bz2
android_packages_wallpapers_LivePicker-7d98c8fca6d1edd51178a65847687d81562d7d6e.zip
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
Diffstat (limited to 'res/values/styles.xml')
-rw-r--r--res/values/styles.xml32
1 files changed, 14 insertions, 18 deletions
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