diff options
| author | Alan Viverette <alanv@google.com> | 2015-05-06 17:25:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-06 17:25:26 +0000 |
| commit | 809d5d7fbe20e6c84ea19480efa531af765b792b (patch) | |
| tree | 57a99b549d1604441bc236e5982bed5059ed326c /packages | |
| parent | 4d5c20c613a6716b14bd8ca3f178672c356a89e5 (diff) | |
| parent | b9da280ac20091673878f3c4b04c65d0510ba23d (diff) | |
| download | frameworks_base-809d5d7fbe20e6c84ea19480efa531af765b792b.zip frameworks_base-809d5d7fbe20e6c84ea19480efa531af765b792b.tar.gz frameworks_base-809d5d7fbe20e6c84ea19480efa531af765b792b.tar.bz2 | |
Merge "DayNight theme for framework packages" into mnc-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/PrintSpooler/res/values/themes.xml | 5 | ||||
| -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 |
4 files changed, 6 insertions, 9 deletions
diff --git a/packages/PrintSpooler/res/values/themes.xml b/packages/PrintSpooler/res/values/themes.xml index 532b01f..db319e9 100644 --- a/packages/PrintSpooler/res/values/themes.xml +++ b/packages/PrintSpooler/res/values/themes.xml @@ -16,10 +16,7 @@ <resources> - <style name="PrintActivity" parent="@android:style/Theme.Material"> - <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> + <style name="PrintActivity" parent="@android:style/Theme.Material.Settings"> <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 5b4b4fd..dda9358 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -121,7 +121,7 @@ <activity android:name=".BugreportWarningActivity" - android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" + android:theme="@*android:style/Theme.Material.DayNight.Dialog.Alert" android:finishOnCloseSystemDialogs="true" android:excludeFromRecents="true" android:exported="false" /> diff --git a/packages/VpnDialogs/AndroidManifest.xml b/packages/VpnDialogs/AndroidManifest.xml index 375c5d8..32e1e6d 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.DeviceDefault.Light.Dialog.Alert"> + android:theme="@*android:style/Theme.Material.DayNight.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.DeviceDefault.Light.Dialog.Alert" + android:theme="@*android:style/Theme.Material.DayNight.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 a34b25a..e438c84 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.DeviceDefault"> + <style name="Theme.WallpaperCropper" parent="@android:style/Theme.Material.DayNight"> <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.DeviceDefault.ActionBar"> + <style name="WallpaperCropperActionBar" parent="@android:style/Widget.Material.ActionBar"> <item name="android:displayOptions">showCustom</item> <item name="android:background">#88000000</item> </style> |