summaryrefslogtreecommitdiffstats
path: root/WallpaperPicker/res
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2014-10-08 17:31:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-08 17:31:10 +0000
commitde326d08d8764e7f9c610a5c9b755bfa78ae2eb9 (patch)
treee895e3343433c578fa19c4bb37696b726146a079 /WallpaperPicker/res
parent7bda3d26c77a5aa09d0c391d9d20125b8133801b (diff)
parente03b81294f046474cf4057bec20dc560a2e053d4 (diff)
downloadandroid_packages_apps_Trebuchet-de326d08d8764e7f9c610a5c9b755bfa78ae2eb9.tar.gz
android_packages_apps_Trebuchet-de326d08d8764e7f9c610a5c9b755bfa78ae2eb9.tar.bz2
android_packages_apps_Trebuchet-de326d08d8764e7f9c610a5c9b755bfa78ae2eb9.zip
Merge "Using DeviceDefault theme for Launcher and WallpaperPicker" into ub-now-queens
Diffstat (limited to 'WallpaperPicker/res')
-rw-r--r--WallpaperPicker/res/values-v19/styles.xml4
-rw-r--r--WallpaperPicker/res/values/styles.xml8
2 files changed, 6 insertions, 6 deletions
diff --git a/WallpaperPicker/res/values-v19/styles.xml b/WallpaperPicker/res/values-v19/styles.xml
index 85a989d55..136cf012c 100644
--- a/WallpaperPicker/res/values-v19/styles.xml
+++ b/WallpaperPicker/res/values-v19/styles.xml
@@ -18,14 +18,14 @@
-->
<resources>
- <style name="Theme.WallpaperCropper" parent="@android:style/Theme.Holo">
+ <style name="Theme.WallpaperCropper" parent="@android:style/Theme.DeviceDefault">
<item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowActionBarOverlay">true</item>
<item name="android:windowTranslucentNavigation">true</item>
</style>
- <style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar">
+ <style name="Theme" parent="@android:style/Theme.DeviceDefault.Wallpaper.NoTitleBar">
<item name="android:windowTranslucentStatus">true</item>
<item name="android:windowTranslucentNavigation">true</item>
</style>
diff --git a/WallpaperPicker/res/values/styles.xml b/WallpaperPicker/res/values/styles.xml
index 16b11f279..f4008f159 100644
--- a/WallpaperPicker/res/values/styles.xml
+++ b/WallpaperPicker/res/values/styles.xml
@@ -18,7 +18,7 @@
-->
<resources>
- <style name="Theme.WallpaperCropper" parent="@android:style/Theme.Holo">
+ <style name="Theme.WallpaperCropper" parent="@android:style/Theme.DeviceDefault">
<item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowActionBarOverlay">true</item>
@@ -30,15 +30,15 @@
<item name="android:windowShowWallpaper">true</item>
</style>
- <style name="WallpaperCropperActionBar" parent="android:style/Widget.Holo.ActionBar">
+ <style name="WallpaperCropperActionBar" parent="@android:style/Widget.DeviceDefault.ActionBar">
<item name="android:displayOptions">showCustom</item>
<item name="android:background">#88000000</item>
</style>
- <style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar">
+ <style name="Theme" parent="@android:style/Theme.DeviceDefault.Wallpaper.NoTitleBar">
</style>
- <style name="ActionBarSetWallpaperStyle" parent="@android:style/Widget.Holo.ActionButton">
+ <style name="ActionBarSetWallpaperStyle" parent="@android:style/Widget.DeviceDefault.ActionButton">
<item name="android:textColor">#ffffffff</item>
</style>
</resources>