Merge "Remove DayNight theme" into nyc-dev am: b4e7b54
am: 1f890d3
* commit '1f890d325399fb43c08437beddf0533618d11f87':
Remove DayNight theme
Change-Id: I751f5993fdfd50c53feb6c0ab76a57ddd0549b89
This commit is contained in:
@@ -2993,7 +2993,7 @@
|
||||
android:killAfterRestore="false"
|
||||
android:icon="@drawable/ic_launcher_android"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/Theme.Material.DayNight.DarkActionBar"
|
||||
android:theme="@style/Theme.Material.Light.DarkActionBar"
|
||||
android:defaultToDeviceProtectedStorage="true"
|
||||
android:directBootAware="true">
|
||||
<activity android:name="com.android.internal.app.ChooserActivity"
|
||||
@@ -3029,7 +3029,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"
|
||||
@@ -3062,7 +3062,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>
|
||||
@@ -3070,14 +3070,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>
|
||||
@@ -3085,19 +3085,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>
|
||||
@@ -3117,7 +3117,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>
|
||||
@@ -3138,7 +3138,7 @@
|
||||
<activity android:name="com.android.internal.app.ConfirmUserCreationActivity"
|
||||
android:excludeFromRecents="true"
|
||||
android:process=":ui"
|
||||
android:theme="@style/Theme.Material.DayNight.Dialog.Alert">
|
||||
android:theme="@style/Theme.Material.Light.Dialog.Alert">
|
||||
<intent-filter android:priority="1000">
|
||||
<action android:name="android.os.action.CREATE_USER" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
@@ -3146,7 +3146,7 @@
|
||||
</activity>
|
||||
|
||||
<activity android:name="com.android.internal.app.UnlaunchableAppActivity"
|
||||
android:theme="@style/Theme.Material.DayNight.Dialog.Alert"
|
||||
android:theme="@style/Theme.Material.Light.Dialog.Alert"
|
||||
android:excludeFromRecents="true"
|
||||
android:process=":ui">
|
||||
</activity>
|
||||
|
||||
@@ -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>
|
||||
@@ -2451,24 +2451,6 @@
|
||||
<java-symbol type="id" name="aerr_close" />
|
||||
<java-symbol type="id" name="aerr_mute" />
|
||||
|
||||
<!-- Framework-private Material.DayNight styles. -->
|
||||
<java-symbol type="style" name="Theme.Material.DayNight" />
|
||||
<java-symbol type="style" name="Theme.Material.DayNight.DarkActionBar" />
|
||||
<java-symbol type="style" name="Theme.Material.DayNight.Dialog" />
|
||||
<java-symbol type="style" name="Theme.Material.DayNight.Dialog.Alert" />
|
||||
<java-symbol type="style" name="Theme.Material.DayNight.Dialog.MinWidth" />
|
||||
<java-symbol type="style" name="Theme.Material.DayNight.Dialog.NoActionBar" />
|
||||
<java-symbol type="style" name="Theme.Material.DayNight.Dialog.NoActionBar.MinWidth" />
|
||||
<java-symbol type="style" name="Theme.Material.DayNight.Dialog.Presentation" />
|
||||
<java-symbol type="style" name="Theme.Material.DayNight.DialogWhenLarge" />
|
||||
<java-symbol type="style" name="Theme.Material.DayNight.DialogWhenLarge.NoActionBar" />
|
||||
<java-symbol type="style" name="Theme.Material.DayNight.NoActionBar" />
|
||||
<java-symbol type="style" name="Theme.Material.DayNight.NoActionBar.Fullscreen" />
|
||||
<java-symbol type="style" name="Theme.Material.DayNight.NoActionBar.Overscan" />
|
||||
<java-symbol type="style" name="Theme.Material.DayNight.NoActionBar.TranslucentDecor" />
|
||||
<java-symbol type="style" name="Theme.Material.DayNight.Panel" />
|
||||
<java-symbol type="style" name="Theme.Material.DayNight.DialogWhenLarge.DarkActionBar" />
|
||||
|
||||
<java-symbol type="string" name="status_bar_rotate" />
|
||||
<java-symbol type="string" name="status_bar_headset" />
|
||||
<java-symbol type="string" name="status_bar_data_saver" />
|
||||
|
||||
@@ -1294,7 +1294,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>
|
||||
|
||||
@@ -1304,7 +1304,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>
|
||||
|
||||
@@ -1313,41 +1313,41 @@ please see themes_device_defaults.xml.
|
||||
<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.DayNight.Dialog.Presentation">
|
||||
<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.SearchBar" parent="Theme.Material.DayNight.SearchBar">
|
||||
<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.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>
|
||||
|
||||
@@ -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>
|
||||
@@ -139,7 +139,7 @@
|
||||
|
||||
<activity
|
||||
android:name=".BugreportWarningActivity"
|
||||
android:theme="@*android:style/Theme.Material.DayNight.Dialog.Alert"
|
||||
android:theme="@android:style/Theme.Material.Light.Dialog.Alert"
|
||||
android:finishOnCloseSystemDialogs="true"
|
||||
android:excludeFromRecents="true"
|
||||
android:exported="false" />
|
||||
|
||||
@@ -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.Material.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.Material.Light.Dialog.Alert"
|
||||
android:noHistory="true">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN"/>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
-->
|
||||
|
||||
<resources>
|
||||
<style name="Theme.WallpaperCropper" parent="@*android:style/Theme.Material.DayNight">
|
||||
<style name="Theme.WallpaperCropper" parent="@android:style/Theme.Material.Light">
|
||||
<item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>
|
||||
<item name="android:windowFullscreen">true</item>
|
||||
<item name="android:windowActionBarOverlay">true</item>
|
||||
|
||||
@@ -169,7 +169,7 @@ public final class SystemServer {
|
||||
* visual content.
|
||||
*/
|
||||
private static final int DEFAULT_SYSTEM_THEME =
|
||||
com.android.internal.R.style.Theme_Material_DayNight_DarkActionBar;
|
||||
com.android.internal.R.style.Theme_Material_Light_DarkActionBar;
|
||||
|
||||
private final int mFactoryTestMode;
|
||||
private Timer mProfilerSnapshotTimer;
|
||||
|
||||
Reference in New Issue
Block a user