diff options
author | Alan Viverette <alanv@google.com> | 2015-06-18 15:15:16 -0700 |
---|---|---|
committer | Alan Viverette <alanv@google.com> | 2015-06-18 15:15:16 -0700 |
commit | 15d48a16f645509cb0c6a1f3abf52ddd233cd8b5 (patch) | |
tree | 0c9a53fda50dcca7549cd29eb3ac9c0151fb0830 /packages | |
parent | 9a08fe2aca44f190162b198a726bc406ed19c1c7 (diff) | |
download | frameworks_base-15d48a16f645509cb0c6a1f3abf52ddd233cd8b5.zip frameworks_base-15d48a16f645509cb0c6a1f3abf52ddd233cd8b5.tar.gz frameworks_base-15d48a16f645509cb0c6a1f3abf52ddd233cd8b5.tar.bz2 |
DO NOT MERGE: Remove DayNight theme
Do not go gentle into that good night,
Old age should burn and rave at close of day;
Rage, rage against the dying of the light.
Though wise men at their end know dark is right,
Because their words had forked no lightning they
Do not go gentle into that good night.
Bug: 21854466
Change-Id: I0b7cd116c23f7df88e94f31b3aee7dd22a102804
Diffstat (limited to 'packages')
-rw-r--r-- | packages/DocumentsUI/res/values-sw720dp/styles.xml | 2 | ||||
-rw-r--r-- | packages/DocumentsUI/res/values/styles.xml | 2 | ||||
-rw-r--r-- | packages/PrintSpooler/res/values/themes.xml | 3 | ||||
-rw-r--r-- | packages/Shell/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | packages/VpnDialogs/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | packages/WallpaperCropper/res/values/styles.xml | 4 |
6 files changed, 10 insertions, 7 deletions
diff --git a/packages/DocumentsUI/res/values-sw720dp/styles.xml b/packages/DocumentsUI/res/values-sw720dp/styles.xml index 0b03a94..d7c031e 100644 --- a/packages/DocumentsUI/res/values-sw720dp/styles.xml +++ b/packages/DocumentsUI/res/values-sw720dp/styles.xml @@ -16,7 +16,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="DialogWhenReallyLarge" parent="@*android:style/Theme.Material.DayNight.Dialog"> + <style name="DialogWhenReallyLarge" parent="@*android:style/Theme.DeviceDefault.Light.Dialog"> <!-- We do not specify width of window here because the max size of floating window specified by windowFixedWidthis is limited. --> <item name="*android:windowFixedHeightMajor">80%</item> diff --git a/packages/DocumentsUI/res/values/styles.xml b/packages/DocumentsUI/res/values/styles.xml index 6d741aa..8c4b777 100644 --- a/packages/DocumentsUI/res/values/styles.xml +++ b/packages/DocumentsUI/res/values/styles.xml @@ -16,7 +16,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="DialogWhenReallyLarge" parent="@android:style/Theme.Material.DayNight.DarkActionBar" /> + <style name="DialogWhenReallyLarge" parent="@android:style/Theme.DeviceDefault.Light.DarkActionBar" /> <style name="DocumentsTheme" parent="@style/DialogWhenReallyLarge"> <item name="android:actionBarWidgetTheme">@null</item> diff --git a/packages/PrintSpooler/res/values/themes.xml b/packages/PrintSpooler/res/values/themes.xml index 05de5b7..11fa991 100644 --- a/packages/PrintSpooler/res/values/themes.xml +++ b/packages/PrintSpooler/res/values/themes.xml @@ -17,6 +17,9 @@ <resources> <style name="PrintActivity" parent="@android:style/Theme.DeviceDefault"> + <item name="android:colorPrimary">@*android:color/material_blue_grey_900</item> + <item name="android:colorPrimaryDark">@*android:color/material_blue_grey_950</item> + <item name="android:colorAccent">@*android:color/material_deep_teal_500</item> <item name="android:windowIsTranslucent">true</item> <item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowContentOverlay">@null</item> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 640fb29..9832b45 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -128,7 +128,7 @@ <activity android:name=".BugreportWarningActivity" - android:theme="@*android:style/Theme.Material.DayNight.Dialog.Alert" + android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" android:finishOnCloseSystemDialogs="true" android:excludeFromRecents="true" android:exported="false" /> diff --git a/packages/VpnDialogs/AndroidManifest.xml b/packages/VpnDialogs/AndroidManifest.xml index 32e1e6d..375c5d8 100644 --- a/packages/VpnDialogs/AndroidManifest.xml +++ b/packages/VpnDialogs/AndroidManifest.xml @@ -24,7 +24,7 @@ <application android:label="VpnDialogs" android:allowBackup="false" > <activity android:name=".ConfirmDialog" - android:theme="@*android:style/Theme.Material.DayNight.Dialog.Alert"> + android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.DEFAULT"/> @@ -32,7 +32,7 @@ </activity> <activity android:name=".ManageDialog" - android:theme="@*android:style/Theme.Material.DayNight.Dialog.Alert" + android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" android:noHistory="true"> <intent-filter> <action android:name="android.intent.action.MAIN"/> 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> |