summaryrefslogtreecommitdiffstats
path: root/res/values/styles.xml
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-12-15 03:03:08 -0700
committerLinux Build Service Account <lnxbuild@localhost>2016-12-15 03:03:08 -0700
commit78f6237b37c829c54e456f3f782ee564ad15b462 (patch)
tree774c3d1aeaf93f03d9505d74b9d2eead039906ed /res/values/styles.xml
parentcf093f3546f841d04b55588bed97c2efdafa5bad (diff)
parentb5ef268cf8119b893c208655a0139a803b6f1c48 (diff)
downloadandroid_packages_wallpapers_LivePicker-78f6237b37c829c54e456f3f782ee564ad15b462.tar.gz
android_packages_wallpapers_LivePicker-78f6237b37c829c54e456f3f782ee564ad15b462.tar.bz2
android_packages_wallpapers_LivePicker-78f6237b37c829c54e456f3f782ee564ad15b462.zip
Merge b5ef268cf8119b893c208655a0139a803b6f1c48 on remote branch
Change-Id: Idb635194062da013f2a544429e896f9e03ece198
Diffstat (limited to 'res/values/styles.xml')
-rw-r--r--res/values/styles.xml36
1 files changed, 18 insertions, 18 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 01747e7..c3dc2b3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -21,28 +21,28 @@
<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>
+
+ <!-- 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 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>
+ <item name="colorAccent">@*android:color/accent_device_default_dark</item>
+
+ <item name="android:windowDisablePreview">true</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