Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE: Remove DayNight theme" into mnc-dev

Browse Source
This commit is contained in:
Alan Viverette
2015-06-18 22:21:46 +00:00
committed by Android (Google) Code Review
parent 2d5f41e4c1 15d48a16f6
commit f1da9a1401
14 changed files with 93 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
api/current.txt
View File

@@ -2112,22 +2112,6 @@ package android {
field public static final int Theme_Light_Panel = 16973914; // 0x103005a
field public static final int Theme_Light_WallpaperSettings = 16973922; // 0x1030062
field public static final int Theme_Material = 16974372; // 0x1030224
field public static final int Theme_Material_DayNight = 16974548; // 0x10302d4
field public static final int Theme_Material_DayNight_DarkActionBar = 16974549; // 0x10302d5
field public static final int Theme_Material_DayNight_Dialog = 16974550; // 0x10302d6
field public static final int Theme_Material_DayNight_DialogWhenLarge = 16974556; // 0x10302dc
field public static final int Theme_Material_DayNight_DialogWhenLarge_DarkActionBar = 16974568; // 0x10302e8
field public static final int Theme_Material_DayNight_DialogWhenLarge_NoActionBar = 16974557; // 0x10302dd
field public static final int Theme_Material_DayNight_Dialog_Alert = 16974551; // 0x10302d7
field public static final int Theme_Material_DayNight_Dialog_MinWidth = 16974552; // 0x10302d8
field public static final int Theme_Material_DayNight_Dialog_NoActionBar = 16974553; // 0x10302d9
field public static final int Theme_Material_DayNight_Dialog_NoActionBar_MinWidth = 16974554; // 0x10302da
field public static final int Theme_Material_DayNight_Dialog_Presentation = 16974555; // 0x10302db
field public static final int Theme_Material_DayNight_NoActionBar = 16974558; // 0x10302de
field public static final int Theme_Material_DayNight_NoActionBar_Fullscreen = 16974559; // 0x10302df
field public static final int Theme_Material_DayNight_NoActionBar_Overscan = 16974560; // 0x10302e0
field public static final int Theme_Material_DayNight_NoActionBar_TranslucentDecor = 16974561; // 0x10302e1
field public static final int Theme_Material_DayNight_Panel = 16974562; // 0x10302e2
field public static final int Theme_Material_Dialog = 16974373; // 0x1030225
field public static final int Theme_Material_DialogWhenLarge = 16974379; // 0x103022b
field public static final int Theme_Material_DialogWhenLarge_NoActionBar = 16974380; // 0x103022c
@@ -2141,7 +2125,6 @@ package android {
field public static final int Theme_Material_Light_DarkActionBar = 16974392; // 0x1030238
field public static final int Theme_Material_Light_Dialog = 16974393; // 0x1030239
field public static final int Theme_Material_Light_DialogWhenLarge = 16974399; // 0x103023f
field public static final int Theme_Material_Light_DialogWhenLarge_DarkActionBar = 16974567; // 0x10302e7
field public static final int Theme_Material_Light_DialogWhenLarge_NoActionBar = 16974400; // 0x1030240
field public static final int Theme_Material_Light_Dialog_Alert = 16974394; // 0x103023a
field public static final int Theme_Material_Light_Dialog_MinWidth = 16974395; // 0x103023b
@@ -2597,6 +2580,21 @@ package android {
field public static final int Widget_Toolbar = 16974311; // 0x10301e7
field public static final int Widget_Toolbar_Button_Navigation = 16974312; // 0x10301e8
field public static final int Widget_WebView = 16973875; // 0x1030033
field public static final int __reserved10 = 16974550; // 0x10302d6
field public static final int __reserved11 = 16974551; // 0x10302d7
field public static final int __reserved12 = 16974552; // 0x10302d8
field public static final int __reserved13 = 16974553; // 0x10302d9
field public static final int __reserved14 = 16974554; // 0x10302da
field public static final int __reserved15 = 16974555; // 0x10302db
field public static final int __reserved16 = 16974556; // 0x10302dc
field public static final int __reserved17 = 16974557; // 0x10302dd
field public static final int __reserved18 = 16974558; // 0x10302de
field public static final int __reserved19 = 16974559; // 0x10302df
field public static final int __reserved20 = 16974560; // 0x10302e0
field public static final int __reserved21 = 16974561; // 0x10302e1
field public static final int __reserved22 = 16974562; // 0x10302e2
field public static final int __reserved8 = 16974548; // 0x10302d4
field public static final int __reserved9 = 16974549; // 0x10302d5
}
public static final class R.transition {

32
api/system-current.txt
View File

@@ -2194,22 +2194,6 @@ package android {
field public static final int Theme_Light_Panel = 16973914; // 0x103005a
field public static final int Theme_Light_WallpaperSettings = 16973922; // 0x1030062
field public static final int Theme_Material = 16974372; // 0x1030224
field public static final int Theme_Material_DayNight = 16974548; // 0x10302d4
field public static final int Theme_Material_DayNight_DarkActionBar = 16974549; // 0x10302d5
field public static final int Theme_Material_DayNight_Dialog = 16974550; // 0x10302d6
field public static final int Theme_Material_DayNight_DialogWhenLarge = 16974556; // 0x10302dc
field public static final int Theme_Material_DayNight_DialogWhenLarge_DarkActionBar = 16974568; // 0x10302e8
field public static final int Theme_Material_DayNight_DialogWhenLarge_NoActionBar = 16974557; // 0x10302dd
field public static final int Theme_Material_DayNight_Dialog_Alert = 16974551; // 0x10302d7
field public static final int Theme_Material_DayNight_Dialog_MinWidth = 16974552; // 0x10302d8
field public static final int Theme_Material_DayNight_Dialog_NoActionBar = 16974553; // 0x10302d9
field public static final int Theme_Material_DayNight_Dialog_NoActionBar_MinWidth = 16974554; // 0x10302da
field public static final int Theme_Material_DayNight_Dialog_Presentation = 16974555; // 0x10302db
field public static final int Theme_Material_DayNight_NoActionBar = 16974558; // 0x10302de
field public static final int Theme_Material_DayNight_NoActionBar_Fullscreen = 16974559; // 0x10302df
field public static final int Theme_Material_DayNight_NoActionBar_Overscan = 16974560; // 0x10302e0
field public static final int Theme_Material_DayNight_NoActionBar_TranslucentDecor = 16974561; // 0x10302e1
field public static final int Theme_Material_DayNight_Panel = 16974562; // 0x10302e2
field public static final int Theme_Material_Dialog = 16974373; // 0x1030225
field public static final int Theme_Material_DialogWhenLarge = 16974379; // 0x103022b
field public static final int Theme_Material_DialogWhenLarge_NoActionBar = 16974380; // 0x103022c
@@ -2223,7 +2207,6 @@ package android {
field public static final int Theme_Material_Light_DarkActionBar = 16974392; // 0x1030238
field public static final int Theme_Material_Light_Dialog = 16974393; // 0x1030239
field public static final int Theme_Material_Light_DialogWhenLarge = 16974399; // 0x103023f
field public static final int Theme_Material_Light_DialogWhenLarge_DarkActionBar = 16974567; // 0x10302e7
field public static final int Theme_Material_Light_DialogWhenLarge_NoActionBar = 16974400; // 0x1030240
field public static final int Theme_Material_Light_Dialog_Alert = 16974394; // 0x103023a
field public static final int Theme_Material_Light_Dialog_MinWidth = 16974395; // 0x103023b
@@ -2679,6 +2662,21 @@ package android {
field public static final int Widget_Toolbar = 16974311; // 0x10301e7
field public static final int Widget_Toolbar_Button_Navigation = 16974312; // 0x10301e8
field public static final int Widget_WebView = 16973875; // 0x1030033
field public static final int __reserved10 = 16974550; // 0x10302d6
field public static final int __reserved11 = 16974551; // 0x10302d7
field public static final int __reserved12 = 16974552; // 0x10302d8
field public static final int __reserved13 = 16974553; // 0x10302d9
field public static final int __reserved14 = 16974554; // 0x10302da
field public static final int __reserved15 = 16974555; // 0x10302db
field public static final int __reserved16 = 16974556; // 0x10302dc
field public static final int __reserved17 = 16974557; // 0x10302dd
field public static final int __reserved18 = 16974558; // 0x10302de
field public static final int __reserved19 = 16974559; // 0x10302df
field public static final int __reserved20 = 16974560; // 0x10302e0
field public static final int __reserved21 = 16974561; // 0x10302e1
field public static final int __reserved22 = 16974562; // 0x10302e2
field public static final int __reserved8 = 16974548; // 0x10302d4
field public static final int __reserved9 = 16974549; // 0x10302d5
}
public static final class R.transition {

19
core/res/AndroidManifest.xml
View File

@@ -2433,8 +2433,7 @@
android:backupAgent="com.android.server.backup.SystemBackupAgent"
android:killAfterRestore="false"
android:icon="@drawable/ic_launcher_android"
android:supportsRtl="true"
android:theme="@style/Theme.Material.DayNight.DarkActionBar">
android:supportsRtl="true">
<activity android:name="com.android.internal.app.ChooserActivity"
android:theme="@style/Theme.DeviceDefault.Resolver"
android:finishOnCloseSystemDialogs="true"
@@ -2467,7 +2466,7 @@
android:label="@string/managed_profile_label">
</activity-alias>
<activity android:name="com.android.internal.app.HeavyWeightSwitcherActivity"
android:theme="@style/Theme.Material.DayNight.Dialog"
android:theme="@style/Theme.Material.Light.Dialog"
android:label="@string/heavy_weight_switcher_title"
android:finishOnCloseSystemDialogs="true"
android:excludeFromRecents="true"
@@ -2500,7 +2499,7 @@
<activity android:name="android.accounts.ChooseAccountActivity"
android:excludeFromRecents="true"
android:exported="true"
android:theme="@style/Theme.Material.DayNight.Dialog"
android:theme="@style/Theme.Material.Light.Dialog"
android:label="@string/choose_account_label"
android:process=":ui">
</activity>
@@ -2508,14 +2507,14 @@
<activity android:name="android.accounts.ChooseTypeAndAccountActivity"
android:excludeFromRecents="true"
android:exported="true"
android:theme="@style/Theme.Material.DayNight.Dialog"
android:theme="@style/Theme.Material.Light.Dialog"
android:label="@string/choose_account_label"
android:process=":ui">
</activity>
<activity android:name="android.accounts.ChooseAccountTypeActivity"
android:excludeFromRecents="true"
android:theme="@style/Theme.Material.DayNight.Dialog"
android:theme="@style/Theme.Material.Light.Dialog"
android:label="@string/choose_account_label"
android:process=":ui">
</activity>
@@ -2523,19 +2522,19 @@
<activity android:name="android.accounts.CantAddAccountActivity"
android:excludeFromRecents="true"
android:exported="true"
android:theme="@style/Theme.Material.DayNight.Dialog.NoActionBar"
android:theme="@style/Theme.Material.Light.Dialog.NoActionBar"
android:process=":ui">
</activity>
<activity android:name="android.accounts.GrantCredentialsPermissionActivity"
android:excludeFromRecents="true"
android:exported="true"
android:theme="@style/Theme.Material.DayNight.DialogWhenLarge"
android:theme="@style/Theme.Material.Light.DialogWhenLarge"
android:process=":ui">
</activity>
<activity android:name="android.content.SyncActivityTooManyDeletes"
android:theme="@style/Theme.Material.DayNight.Dialog"
android:theme="@style/Theme.Material.Light.Dialog"
android:label="@string/sync_too_many_deletes"
android:process=":ui">
</activity>
@@ -2555,7 +2554,7 @@
</activity>
<activity android:name="com.android.internal.app.NetInitiatedActivity"
android:theme="@style/Theme.Material.DayNight.Dialog.Alert"
android:theme="@style/Theme.Material.Light.Dialog.Alert"
android:excludeFromRecents="true"
android:process=":ui">
</activity>

117
core/res/res/values-night/themes_material_daynight.xml
View File

@@ -1,117 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2015 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!--
===============================================================
PLEASE READ
===============================================================
The Material themes must not be modified in order to pass CTS.
Many related themes and styles depend on other values defined in this file.
If you would like to provide custom themes and styles for your device,
please see themes_device_defaults.xml.
===============================================================
PLEASE READ
===============================================================
-->
<resources>
<!-- Material theme (day/night version) for activities. -->
<style name="Theme.Material.DayNight" parent="Theme.Material" />
<!-- Variant of Material.DayNight that has a solid (opaque) action bar
with an inverse color profile. The dark action bar sharply stands out against
the light content (when applicable). -->
<style name="Theme.Material.DayNight.DarkActionBar" parent="Theme.Material" />
<!-- Variant of Material.DayNight with no action bar. -->
<style name="Theme.Material.DayNight.NoActionBar" parent="Theme.Material.NoActionBar" />
<!-- Variant of Material.DayNight that has no title bar and fills
the entire screen. This theme
sets {@link android.R.attr#windowFullscreen} to true. -->
<style name="Theme.Material.DayNight.NoActionBar.Fullscreen" parent="Theme.Material.NoActionBar.Fullscreen" />
<!-- Variant of Material.DayNight that has no title bar and fills
the entire screen and extends into the display overscan region. This theme
sets {@link android.R.attr#windowFullscreen} and {@link android.R.attr#windowOverscan}
to true. -->
<style name="Theme.Material.DayNight.NoActionBar.Overscan" parent="Theme.Material.NoActionBar.Overscan" />
<!-- Variant of Material.DayNight that has no title bar and translucent
system decor. This theme sets {@link android.R.attr#windowTranslucentStatus} and
{@link android.R.attr#windowTranslucentNavigation} to true. -->
<style name="Theme.Material.DayNight.NoActionBar.TranslucentDecor" parent="Theme.Material.NoActionBar.TranslucentDecor" />
<!-- Default Material.DayNight theme for panel windows. This removes all extraneous
window decorations, so you basically have an empty rectangle in which
to place your content. It makes the window floating, with a transparent
background, and turns off dimming behind the window. -->
<style name="Theme.Material.DayNight.Panel" parent="Theme.Material.Panel" />
<!-- Material theme (day/night version) for dialog windows and activities,
which is used by the {@link android.app.Dialog} class. This changes
the window to be floating (not fill the entire screen), and puts a
frame around its contents. You can set this theme on an activity if
you would like to make an activity that looks like a Dialog. -->
<style name="Theme.Material.DayNight.Dialog" parent="Theme.Material.DayNight.BaseDialog" />
<style name="Theme.Material.DayNight.BaseDialog" parent="Theme.Material.BaseDialog" />
<!-- Variant of Theme.Material.DayNight.Dialog that has a nice minimum width for
a regular dialog. -->
<style name="Theme.Material.DayNight.Dialog.MinWidth" parent="Theme.Material.Dialog.MinWidth" />
<!-- Variant of Theme.Material.DayNight.Dialog that does not include a title bar. -->
<style name="Theme.Material.DayNight.Dialog.NoActionBar" parent="Theme.Material.Dialog.NoActionBar" />
<!-- Variant of Theme.Material.DayNight.Dialog.NoActionBar that has a nice minimum width for
a regular dialog. -->
<style name="Theme.Material.DayNight.Dialog.NoActionBar.MinWidth" parent="Theme.Material.Dialog.NoActionBar.MinWidth" />
<!-- Variant of Theme.Material.DayNight.Dialog that has a fixed size. -->
<style name="Theme.Material.DayNight.Dialog.FixedSize" parent="Theme.Material.Dialog.FixedSize" />
<!-- Variant of Theme.Material.DayNight.Dialog.NoActionBar that has a fixed size. -->
<style name="Theme.Material.DayNight.Dialog.NoActionBar.FixedSize" parent="Theme.Material.Dialog.NoActionBar.FixedSize" />
<!-- Theme for a window that will be displayed either full-screen on
smaller screens (small, normal) or as a dialog on larger screens
(large, xlarge). -->
<style name="Theme.Material.DayNight.DialogWhenLarge" parent="Theme.Material.DialogWhenLarge" />
<!-- Theme for a window with a dark action bar that will be displayed
either full-screen on smaller screens (small, normal) or as a dialog
on larger screens (large, xlarge). -->
<style name="Theme.Material.DayNight.DialogWhenLarge.DarkActionBar" parent="Theme.Material.DialogWhenLarge" />
<!-- Theme for a window without an action bar that will be displayed either full-screen
on smaller screens (small, normal) or as a dialog on larger screens
(large, xlarge). -->
<style name="Theme.Material.DayNight.DialogWhenLarge.NoActionBar" parent="Theme.Material.DialogWhenLarge.NoActionBar" />
<!-- Theme for a presentation window on a secondary display. -->
<style name="Theme.Material.DayNight.Dialog.Presentation" parent="Theme.Material.Dialog.Presentation" />
<!-- Material user theme for alert dialog windows, which is used by the
{@link android.app.AlertDialog} class. -->
<style name="Theme.Material.DayNight.Dialog.Alert" parent="Theme.Material.DayNight.Dialog.BaseAlert" />
<style name="Theme.Material.DayNight.Dialog.BaseAlert" parent="Theme.Material.Dialog.BaseAlert" />
<style name="Theme.Material.DayNight.SearchBar" parent="Theme.Material.SearchBar" />
<style name="Theme.Material.DayNight.CompactMenu" parent="Theme.Material.CompactMenu" />
</resources>

48
core/res/res/values/public.xml
View File

@@ -2631,27 +2631,41 @@
<public type="attr" name="fullBackupContent" />
<public type="style" name="Widget.Material.Button.Colored" />
<public type="style" name="Theme.Material.DayNight" />
<public type="style" name="Theme.Material.DayNight.DarkActionBar" />
<public type="style" name="Theme.Material.DayNight.Dialog" />
<public type="style" name="Theme.Material.DayNight.Dialog.Alert" />
<public type="style" name="Theme.Material.DayNight.Dialog.MinWidth" />
<public type="style" name="Theme.Material.DayNight.Dialog.NoActionBar" />
<public type="style" name="Theme.Material.DayNight.Dialog.NoActionBar.MinWidth" />
<public type="style" name="Theme.Material.DayNight.Dialog.Presentation" />
<public type="style" name="Theme.Material.DayNight.DialogWhenLarge" />
<public type="style" name="Theme.Material.DayNight.DialogWhenLarge.NoActionBar" />
<public type="style" name="Theme.Material.DayNight.NoActionBar" />
<public type="style" name="Theme.Material.DayNight.NoActionBar.Fullscreen" />
<public type="style" name="Theme.Material.DayNight.NoActionBar.Overscan" />
<public type="style" name="Theme.Material.DayNight.NoActionBar.TranslucentDecor" />
<public type="style" name="Theme.Material.DayNight.Panel" />
<style name="__reserved8" />
<public type="style" name="__reserved8" />
<style name="__reserved9" />
<public type="style" name="__reserved9" />
<style name="__reserved10" />
<public type="style" name="__reserved10" />
<style name="__reserved11" />
<public type="style" name="__reserved11" />
<style name="__reserved12" />
<public type="style" name="__reserved12" />
<style name="__reserved13" />
<public type="style" name="__reserved13" />
<style name="__reserved14" />
<public type="style" name="__reserved14" />
<style name="__reserved15" />
<public type="style" name="__reserved15" />
<style name="__reserved16" />
<public type="style" name="__reserved16" />
<style name="__reserved17" />
<public type="style" name="__reserved17" />
<style name="__reserved18" />
<public type="style" name="__reserved18" />
<style name="__reserved19" />
<public type="style" name="__reserved19" />
<style name="__reserved20" />
<public type="style" name="__reserved20" />
<style name="__reserved21" />
<public type="style" name="__reserved21" />
<style name="__reserved22" />
<public type="style" name="__reserved22" />
<public type="style" name="Theme.Material.Light.LightStatusBar" />
<public type="style" name="ThemeOverlay.Material.Dialog" />
<public type="style" name="TextAppearance.Material.Widget.Button.Inverse" />
<public type="style" name="ThemeOverlay.Material.Dialog.Alert" />
<public type="style" name="Theme.Material.Light.DialogWhenLarge.DarkActionBar" />
<public type="style" name="Theme.Material.DayNight.DialogWhenLarge.DarkActionBar" />
<public type="id" name="pasteAsPlainText" />
<public type="id" name="undo" />

26
core/res/res/values/themes_material.xml
View File

@@ -1281,7 +1281,7 @@ please see themes_device_defaults.xml.
</style>
<!-- Default theme for Settings and activities launched from Settings. -->
<style name="Theme.Material.Settings" parent="Theme.Material.DayNight.DarkActionBar">
<style name="Theme.Material.Settings" parent="Theme.Material.Light.DarkActionBar">
<item name="colorPrimary">@color/material_blue_grey_900</item>
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
@@ -1291,7 +1291,7 @@ please see themes_device_defaults.xml.
</style>
<!-- Default theme for Settings and activities launched from Settings. -->
<style name="Theme.Material.Settings.NoActionBar" parent="Theme.Material.DayNight.NoActionBar">
<style name="Theme.Material.Settings.NoActionBar" parent="Theme.Material.Light.NoActionBar">
<item name="colorPrimary">@color/material_blue_grey_900</item>
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
@@ -1299,42 +1299,40 @@ please see themes_device_defaults.xml.
<item name="searchDialogTheme">@style/Theme.Material.Settings.SearchBar</item>
<item name="panelMenuListTheme">@style/Theme.Material.Settings.CompactMenu</item>
</style>
<style name="Theme.Material.Settings.BaseDialog" parent="Theme.Material.DayNight.BaseDialog">
<style name="Theme.Material.Settings.BaseDialog" parent="Theme.Material.Light.BaseDialog">
<item name="colorPrimary">@color/material_blue_grey_900</item>
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
</style>
<style name="Theme.Material.Settings.Dialog" parent="Theme.Material.Settings.BaseDialog" />
<style name="Theme.Material.Settings.Dialog.BaseAlert" parent="Theme.Material.DayNight.Dialog.BaseAlert">
<style name="Theme.Material.Settings.Dialog.BaseAlert" parent="Theme.Material.Light.Dialog.BaseAlert">
<item name="colorPrimary">@color/material_blue_grey_900</item>
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
</style>
<style name="Theme.Material.Settings.Dialog.Alert" parent="Theme.Material.Settings.Dialog.BaseAlert" />
<style name="Theme.Material.Settings.DialogWhenLarge" parent="Theme.Material.DayNight.DialogWhenLarge.DarkActionBar">
<style name="Theme.Material.Settings.DialogWhenLarge" parent="Theme.Material.Light.DialogWhenLarge.DarkActionBar">
<item name="colorPrimary">@color/material_blue_grey_900</item>
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
</style>
<style name="Theme.Material.Settings.DialogWhenLarge.NoActionBar" parent="Theme.Material.DayNight.DialogWhenLarge.NoActionBar">
<style name="Theme.Material.Settings.DialogWhenLarge.NoActionBar" parent="Theme.Material.Light.DialogWhenLarge.NoActionBar">
<item name="colorPrimary">@color/material_blue_grey_900</item>
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
</style>
<style name="Theme.Material.Settings.Dialog.Presentation" parent="Theme.Material.Light.Dialog.Presentation">
<item name="colorPrimary">@color/material_blue_grey_900</item>
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
</style>
<style name="Theme.Material.Settings.Dialog.Presentation" parent="Theme.Material.DayNight.Dialog.Presentation">
<style name="Theme.Material.Settings.SearchBar" parent="Theme.Material.Light.SearchBar">
<item name="colorPrimary">@color/material_blue_grey_900</item>
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
</style>
<style name="Theme.Material.Settings.SearchBar" parent="Theme.Material.DayNight.SearchBar">
<item name="colorPrimary">@color/material_blue_grey_900</item>
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
</style>
<style name="Theme.Material.Settings.CompactMenu" parent="Theme.Material.DayNight.CompactMenu">
<style name="Theme.Material.Settings.CompactMenu" parent="Theme.Material.Light.CompactMenu">
<item name="colorPrimary">@color/material_blue_grey_900</item>
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
</style>

117
core/res/res/values/themes_material_daynight.xml
View File

@@ -1,117 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2015 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!--
===============================================================
PLEASE READ
===============================================================
The Material themes must not be modified in order to pass CTS.
Many related themes and styles depend on other values defined in this file.
If you would like to provide custom themes and styles for your device,
please see themes_device_defaults.xml.
===============================================================
PLEASE READ
===============================================================
-->
<resources>
<!-- Material theme (day/night vesion) for activities. -->
<style name="Theme.Material.DayNight" parent="Theme.Material.Light" />
<!-- Variant of Material.DayNight that has a solid (opaque) action bar
with an inverse color profile. The dark action bar sharply stands out against
the light content (when applicable). -->
<style name="Theme.Material.DayNight.DarkActionBar" parent="Theme.Material.Light.DarkActionBar" />
<!-- Variant of Material.DayNight with no action bar. -->
<style name="Theme.Material.DayNight.NoActionBar" parent="Theme.Material.Light.NoActionBar" />
<!-- Variant of Material.DayNight that has no title bar and fills
the entire screen. This theme
sets {@link android.R.attr#windowFullscreen} to true. -->
<style name="Theme.Material.DayNight.NoActionBar.Fullscreen" parent="Theme.Material.Light.NoActionBar.Fullscreen" />
<!-- Variant of Material.DayNight that has no title bar and fills
the entire screen and extends into the display overscan region. This theme
sets {@link android.R.attr#windowFullscreen} and {@link android.R.attr#windowOverscan}
to true. -->
<style name="Theme.Material.DayNight.NoActionBar.Overscan" parent="Theme.Material.Light.NoActionBar.Overscan" />
<!-- Variant of Material.DayNight that has no title bar and translucent
system decor. This theme sets {@link android.R.attr#windowTranslucentStatus} and
{@link android.R.attr#windowTranslucentNavigation} to true. -->
<style name="Theme.Material.DayNight.NoActionBar.TranslucentDecor" parent="Theme.Material.Light.NoActionBar.TranslucentDecor" />
<!-- Default Material.DayNight theme for panel windows. This removes all extraneous
window decorations, so you basically have an empty rectangle in which
to place your content. It makes the window floating, with a transparent
background, and turns off dimming behind the window. -->
<style name="Theme.Material.DayNight.Panel" parent="Theme.Material.Light.Panel" />
<!-- Material theme (day/night vesion) for dialog windows and activities,
which is used by the {@link android.app.Dialog} class. This changes
the window to be floating (not fill the entire screen), and puts a
frame around its contents. You can set this theme on an activity if
you would like to make an activity that looks like a Dialog. -->
<style name="Theme.Material.DayNight.Dialog" parent="Theme.Material.DayNight.BaseDialog" />
<style name="Theme.Material.DayNight.BaseDialog" parent="Theme.Material.Light.BaseDialog" />
<!-- Variant of Theme.Material.DayNight.Dialog that has a nice minimum width for
a regular dialog. -->
<style name="Theme.Material.DayNight.Dialog.MinWidth" parent="Theme.Material.Light.Dialog.MinWidth" />
<!-- Variant of Theme.Material.DayNight.Dialog that does not include a title bar. -->
<style name="Theme.Material.DayNight.Dialog.NoActionBar" parent="Theme.Material.Light.Dialog.NoActionBar" />
<!-- Variant of Theme.Material.DayNight.Dialog.NoActionBar that has a nice minimum width for
a regular dialog. -->
<style name="Theme.Material.DayNight.Dialog.NoActionBar.MinWidth" parent="Theme.Material.Light.Dialog.NoActionBar.MinWidth" />
<!-- Variant of Theme.Material.DayNight.Dialog that has a fixed size. -->
<style name="Theme.Material.DayNight.Dialog.FixedSize" parent="Theme.Material.Light.Dialog.FixedSize" />
<!-- Variant of Theme.Material.DayNight.Dialog.NoActionBar that has a fixed size. -->
<style name="Theme.Material.DayNight.Dialog.NoActionBar.FixedSize" parent="Theme.Material.Light.Dialog.NoActionBar.FixedSize" />
<!-- Theme for a window that will be displayed either full-screen on
smaller screens (small, normal) or as a dialog on larger screens
(large, xlarge). -->
<style name="Theme.Material.DayNight.DialogWhenLarge" parent="Theme.Material.Light.DialogWhenLarge" />
<!-- Theme for a window with a dark action bar that will be displayed
either full-screen on smaller screens (small, normal) or as a dialog
on larger screens (large, xlarge). -->
<style name="Theme.Material.DayNight.DialogWhenLarge.DarkActionBar" parent="Theme.Material.Light.DialogWhenLarge.DarkActionBar" />
<!-- Theme for a window without an action bar that will be displayed either full-screen
on smaller screens (small, normal) or as a dialog on larger screens
(large, xlarge). -->
<style name="Theme.Material.DayNight.DialogWhenLarge.NoActionBar" parent="Theme.Material.Light.DialogWhenLarge.NoActionBar" />
<!-- Theme for a presentation window on a secondary display. -->
<style name="Theme.Material.DayNight.Dialog.Presentation" parent="Theme.Material.Light.Dialog.Presentation" />
<!-- Material user theme for alert dialog windows, which is used by the
{@link android.app.AlertDialog} class. -->
<style name="Theme.Material.DayNight.Dialog.Alert" parent="Theme.Material.DayNight.Dialog.BaseAlert" />
<style name="Theme.Material.DayNight.Dialog.BaseAlert" parent="Theme.Material.Light.Dialog.BaseAlert" />
<style name="Theme.Material.DayNight.SearchBar" parent="Theme.Material.Light.SearchBar" />
<style name="Theme.Material.DayNight.CompactMenu" parent="Theme.Material.Light.CompactMenu" />
</resources>

2
packages/DocumentsUI/res/values-sw720dp/styles.xml
View File

@@ -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>

2
packages/DocumentsUI/res/values/styles.xml
View File

@@ -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>

3
packages/PrintSpooler/res/values/themes.xml
View File

@@ -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>

2
packages/Shell/AndroidManifest.xml
View File

@@ -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" />

4
packages/VpnDialogs/AndroidManifest.xml
View File

@@ -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"/>

4
packages/WallpaperCropper/res/values/styles.xml
View File

@@ -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>

2
services/java/com/android/server/SystemServer.java
View File

@@ -292,7 +292,7 @@ public final class SystemServer {
private void createSystemContext() {
ActivityThread activityThread = ActivityThread.systemMain();
mSystemContext = activityThread.getSystemContext();
mSystemContext.setTheme(android.R.style.Theme_Material_DayNight_DarkActionBar);
mSystemContext.setTheme(android.R.style.Theme_DeviceDefault_Light_DarkActionBar);
}
/**