summaryrefslogtreecommitdiffstats
path: root/WallpaperPicker/res/values/styles.xml
diff options
context:
space:
mode:
authorSelim Cinek <cinek@google.com>2014-03-04 01:50:44 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-04 01:50:44 -0800
commit10acea596e3752d1eab693fd34209767e991c92d (patch)
tree8efbcc9c8f89c8e63f5a33422a4bd98403dd7d90 /WallpaperPicker/res/values/styles.xml
parent919ce78038836547480c37a444fe90b68f9c943f (diff)
parent0c255a946788499d7f169429890d5a423426593b (diff)
downloadandroid_packages_apps_Trebuchet-10acea596e3752d1eab693fd34209767e991c92d.tar.gz
android_packages_apps_Trebuchet-10acea596e3752d1eab693fd34209767e991c92d.tar.bz2
android_packages_apps_Trebuchet-10acea596e3752d1eab693fd34209767e991c92d.zip
am 0c255a94: Merge "Changed behaviour of the wallpaper picker." into ub-now-lunchbox
* commit '0c255a946788499d7f169429890d5a423426593b': Changed behaviour of the wallpaper picker.
Diffstat (limited to 'WallpaperPicker/res/values/styles.xml')
-rw-r--r--WallpaperPicker/res/values/styles.xml10
1 files changed, 10 insertions, 0 deletions
diff --git a/WallpaperPicker/res/values/styles.xml b/WallpaperPicker/res/values/styles.xml
index 6d600bcdc..16b11f279 100644
--- a/WallpaperPicker/res/values/styles.xml
+++ b/WallpaperPicker/res/values/styles.xml
@@ -24,6 +24,12 @@
<item name="android:windowActionBarOverlay">true</item>
</style>
+ <style name="Theme.WallpaperPicker" parent="Theme.WallpaperCropper">
+ <item name="android:windowBackground">@android:color/transparent</item>
+ <item name="android:colorBackgroundCacheHint">@null</item>
+ <item name="android:windowShowWallpaper">true</item>
+ </style>
+
<style name="WallpaperCropperActionBar" parent="android:style/Widget.Holo.ActionBar">
<item name="android:displayOptions">showCustom</item>
<item name="android:background">#88000000</item>
@@ -31,4 +37,8 @@
<style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar">
</style>
+
+ <style name="ActionBarSetWallpaperStyle" parent="@android:style/Widget.Holo.ActionButton">
+ <item name="android:textColor">#ffffffff</item>
+ </style>
</resources>