summaryrefslogtreecommitdiffstats
path: root/packages/WallpaperCropper
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-06-18 22:31:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-18 22:31:41 +0000
commitafc21d72d87390ed0b175c007248c32c5813d1ff (patch)
treef2b7e000d8a8a01933b2b96d59a6669653e32387 /packages/WallpaperCropper
parentfcff4c382dd0efe37f3e603820bf4a7077b65dba (diff)
parentf1da9a1401fe1304bee8a550a0141c79ecc3c0b3 (diff)
downloadframeworks_base-afc21d72d87390ed0b175c007248c32c5813d1ff.zip
frameworks_base-afc21d72d87390ed0b175c007248c32c5813d1ff.tar.gz
frameworks_base-afc21d72d87390ed0b175c007248c32c5813d1ff.tar.bz2
am f1da9a14: Merge "DO NOT MERGE: Remove DayNight theme" into mnc-dev
* commit 'f1da9a1401fe1304bee8a550a0141c79ecc3c0b3': DO NOT MERGE: Remove DayNight theme
Diffstat (limited to 'packages/WallpaperCropper')
-rw-r--r--packages/WallpaperCropper/res/values/styles.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/WallpaperCropper/res/values/styles.xml b/packages/WallpaperCropper/res/values/styles.xml
index e438c84..a34b25a 100644
--- a/packages/WallpaperCropper/res/values/styles.xml
+++ b/packages/WallpaperCropper/res/values/styles.xml
@@ -15,13 +15,13 @@
-->
<resources>
- <style name="Theme.WallpaperCropper" parent="@android:style/Theme.Material.DayNight">
+ <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>
</style>
- <style name="WallpaperCropperActionBar" parent="@android:style/Widget.Material.ActionBar">
+ <style name="WallpaperCropperActionBar" parent="android:style/Widget.DeviceDefault.ActionBar">
<item name="android:displayOptions">showCustom</item>
<item name="android:background">#88000000</item>
</style>