18ddc6525b
Root cause: Inherit from the glif themes in setupdesign library Solution: Not inherit from the glif themes and set Setting theme before applying the dynamic color Bug: 225800660 Test: Manual testing Change-Id: Ic4d71bf7a754888c1ed1590c0483360d65f5da44
267 lines
15 KiB
XML
267 lines
15 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
Copyright (C) 2018 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.
|
|
-->
|
|
|
|
<!-- SUW related themes -->
|
|
<resources>
|
|
<style name="GlifTheme" parent="SudThemeGlif.DayNight">
|
|
<!-- For all AndroidX Alert Dialogs -->
|
|
<item name="alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
|
|
<item name="android:windowBackground">?android:attr/colorBackground</item>
|
|
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
|
|
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
|
|
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
|
|
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
|
|
<item name="side_margin">0dip</item>
|
|
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
|
|
<item name="wifi_signal">@drawable/wifi_signal</item>
|
|
<item name="wifi_friction">@drawable/wifi_friction</item>
|
|
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
|
|
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
|
|
|
|
<!-- LockPatternView colors -->
|
|
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
|
|
</style>
|
|
|
|
<style name="GlifTheme.Light" parent="SudThemeGlif.Light">
|
|
<!-- For all AndroidX Alert Dialogs -->
|
|
<item name="alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
|
|
<item name="android:windowBackground">?android:attr/colorBackground</item>
|
|
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
|
|
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
|
|
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
|
|
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
|
|
<item name="side_margin">0dip</item>
|
|
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
|
|
<item name="wifi_signal">@drawable/wifi_signal</item>
|
|
<item name="wifi_friction">@drawable/wifi_friction</item>
|
|
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
|
|
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
|
|
|
|
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
|
|
</style>
|
|
|
|
<style name="GlifV2Theme" parent="SudThemeGlifV2.DayNight">
|
|
<!-- For all AndroidX Alert Dialogs -->
|
|
<item name="alertDialogTheme">@style/GlifV2ThemeAlertDialog</item>
|
|
<item name="android:windowBackground">?android:attr/colorBackground</item>
|
|
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
|
|
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
|
|
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
|
|
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
|
|
<item name="side_margin">0dip</item>
|
|
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
|
|
<item name="wifi_signal">@drawable/wifi_signal</item>
|
|
<item name="wifi_friction">@drawable/wifi_friction</item>
|
|
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
|
|
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
|
|
|
|
<!-- LockPatternView colors -->
|
|
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
|
|
</style>
|
|
|
|
<style name="GlifV2Theme.Light" parent="SudThemeGlifV2.Light">
|
|
<!-- For all AndroidX Alert Dialogs -->
|
|
<item name="alertDialogTheme">@style/GlifV2ThemeAlertDialog.Light</item>
|
|
<item name="android:windowBackground">?android:attr/colorBackground</item>
|
|
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
|
|
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
|
|
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
|
|
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
|
|
<item name="side_margin">0dip</item>
|
|
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
|
|
<item name="wifi_signal">@drawable/wifi_signal</item>
|
|
<item name="wifi_friction">@drawable/wifi_friction</item>
|
|
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
|
|
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
|
|
|
|
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
|
|
</style>
|
|
|
|
<style name="GlifV3Theme" parent="SudThemeGlifV3.DayNight">
|
|
<!-- For all AndroidX Alert Dialogs -->
|
|
<item name="alertDialogTheme">@style/GlifV2ThemeAlertDialog</item>
|
|
<item name="android:windowBackground">?android:attr/colorBackground</item>
|
|
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
|
|
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
|
|
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
|
|
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
|
|
<item name="side_margin">0dip</item>
|
|
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
|
|
<item name="wifi_signal">@drawable/wifi_signal</item>
|
|
<item name="wifi_friction">@drawable/wifi_friction</item>
|
|
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
|
|
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
|
|
|
|
<!-- LockPatternView colors -->
|
|
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
|
|
</style>
|
|
|
|
<style name="GlifV3Theme.Footer" parent="@style/SudThemeGlifV3.DayNight">
|
|
<item name="android:clipChildren">true</item>
|
|
<item name="android:clipToPadding">true</item>
|
|
</style>
|
|
|
|
<style name="GlifV3Theme.Light" parent="SudThemeGlifV3.Light">
|
|
<!-- For all AndroidX Alert Dialogs -->
|
|
<item name="alertDialogTheme">@style/GlifV2ThemeAlertDialog.Light</item>
|
|
<item name="android:windowBackground">?android:attr/colorBackground</item>
|
|
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
|
|
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
|
|
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
|
|
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
|
|
<item name="side_margin">0dip</item>
|
|
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
|
|
<item name="wifi_signal">@drawable/wifi_signal</item>
|
|
<item name="wifi_friction">@drawable/wifi_friction</item>
|
|
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
|
|
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
|
|
|
|
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
|
|
</style>
|
|
|
|
<style name="GlifV3Theme.Light.NoActionBar" parent="GlifV3Theme.Light">
|
|
<item name="android:windowActionBar">false</item>
|
|
</style>
|
|
|
|
<style name="GlifV3Theme.NoActionBar" parent="GlifV3Theme">
|
|
<item name="android:windowActionBar">false</item>
|
|
</style>
|
|
|
|
<style name="GlifV2Theme.Transparent">
|
|
<item name="android:windowBackground">@android:color/transparent</item>
|
|
<item name="android:windowNoTitle">true</item>
|
|
<item name="android:windowIsFloating">true</item>
|
|
<item name="android:windowAnimationStyle">@null</item>
|
|
</style>
|
|
|
|
<style name="GlifV2Theme.Light.Transparent">
|
|
<item name="android:windowBackground">@android:color/transparent</item>
|
|
<item name="android:windowNoTitle">true</item>
|
|
<item name="android:windowIsFloating">true</item>
|
|
<item name="android:windowAnimationStyle">@null</item>
|
|
</style>
|
|
|
|
<style name="GlifV2ThemeAlertDialog" parent="SuwAlertDialogThemeCompat">
|
|
<item name="android:windowSoftInputMode">adjustResize</item>
|
|
</style>
|
|
|
|
<style name="GlifV2ThemeAlertDialog.Light" parent="SuwAlertDialogThemeCompat.Light">
|
|
<item name="android:windowSoftInputMode">adjustResize</item>
|
|
</style>
|
|
|
|
<style name="GlifV3Theme.Transparent">
|
|
<item name="android:windowBackground">@android:color/transparent</item>
|
|
<item name="android:windowNoTitle">true</item>
|
|
<item name="android:windowIsFloating">true</item>
|
|
<item name="android:windowAnimationStyle">@null</item>
|
|
</style>
|
|
|
|
<style name="GlifV3Theme.Light.Transparent">
|
|
<item name="android:windowBackground">@android:color/transparent</item>
|
|
<item name="android:windowNoTitle">true</item>
|
|
<item name="android:windowIsFloating">true</item>
|
|
<item name="android:windowAnimationStyle">@null</item>
|
|
</style>
|
|
|
|
<style name="SetupWizardTheme.Transparent" parent="GlifTheme">
|
|
<item name="android:windowBackground">@android:color/transparent</item>
|
|
<item name="android:windowNoTitle">true</item>
|
|
<item name="android:windowIsFloating">true</item>
|
|
<item name="android:windowAnimationStyle">@null</item>
|
|
</style>
|
|
|
|
<style name="SetupWizardTheme.Light.Transparent" parent="GlifTheme.Light">
|
|
<item name="android:windowBackground">@android:color/transparent</item>
|
|
<item name="android:windowNoTitle">true</item>
|
|
<item name="android:windowIsFloating">true</item>
|
|
<item name="android:windowAnimationStyle">@null</item>
|
|
</style>
|
|
|
|
<!-- Accessibility portion of Setup Wizard -->
|
|
<style name="SetupWizardAccessibilityTheme" parent="Theme.SettingsBase">
|
|
<item name="android:colorPrimary">@color/material_grey_100</item>
|
|
<item name="android:colorAccent">@color/material_blue_700</item>
|
|
<item name="android:titleTextColor">@color/material_blue_700</item>
|
|
<item name="preferenceTheme">@style/SettingsPreferenceTheme</item>
|
|
<item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
|
|
</style>
|
|
|
|
<style name="SuwAlertDialogThemeCompat" parent="@style/Theme.AppCompat.Dialog.Alert">
|
|
<!-- Referenced SudThemeGlifV3 style -->
|
|
<item name="android:textAllCaps">false</item>
|
|
|
|
<item name="android:windowSoftInputMode">adjustResize</item>
|
|
<!-- copied from Theme.DeviceDefault.Dialog.Alert -->
|
|
<item name="colorAccent">@*android:color/accent_device_default_dark</item>
|
|
<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
|
|
|
|
<item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
|
|
</style>
|
|
|
|
<style name="SuwAlertDialogThemeCompat.Light" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
|
|
<!-- Referenced SudThemeGlifV3.Light style -->
|
|
<item name="android:textAllCaps">false</item>
|
|
|
|
<item name="android:windowSoftInputMode">adjustResize</item>
|
|
<!-- copied from Theme.DeviceDefault.Light.Dialog.Alert -->
|
|
<item name="colorAccent">@*android:color/accent_device_default_light</item>
|
|
<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
|
|
|
|
<item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
|
|
</style>
|
|
|
|
<!-- This theme was applied to Settings pages which are running under SUW with DynamicColor. -->
|
|
<style name="SudDynamicColorThemeSettings.SetupWizard" parent="SudDynamicColorThemeGlifV3.Light">
|
|
<item name="android:textAppearanceListItem">@style/TextAppearance.PreferenceTitle.SettingsLib</item>
|
|
<item name="android:listPreferredItemPaddingStart">24dp</item>
|
|
<item name="android:listPreferredItemPaddingEnd">16dp</item>
|
|
<item name="preferenceTheme">@style/PreferenceTheme.SettingsLib</item>
|
|
<item name="android:switchStyle">@style/Switch.SettingsLib</item>
|
|
<item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item>
|
|
</style>
|
|
|
|
<!-- This theme was applied to Settings pages which are running under SUW with DynamicColor. -->
|
|
<style name="SudDynamicColorThemeSettings.SetupWizard.DayNight" parent="SudDynamicColorThemeGlifV3.DayNight">
|
|
<item name="android:textAppearanceListItem">@style/TextAppearance.PreferenceTitle.SettingsLib</item>
|
|
<item name="android:listPreferredItemPaddingStart">24dp</item>
|
|
<item name="android:listPreferredItemPaddingEnd">16dp</item>
|
|
<item name="preferenceTheme">@style/PreferenceTheme.SettingsLib</item>
|
|
<item name="android:switchStyle">@style/Switch.SettingsLib</item>
|
|
<item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item>
|
|
</style>
|
|
|
|
<!-- This theme was applied to Settings pages which are running under SUW. -->
|
|
<style name="SettingsPreferenceTheme.SetupWizard" parent="@style/PreferenceTheme.SettingsLib">
|
|
<item name="android:textAppearanceListItem">@style/TextAppearance.PreferenceTitle.SettingsLib</item>
|
|
<item name="android:listPreferredItemPaddingStart">@dimen/settingslib_listPreferredItemPaddingStart</item>
|
|
<item name="android:listPreferredItemPaddingEnd">16dp</item>
|
|
<item name="preferenceTheme">@style/PreferenceTheme.SettingsLib</item>
|
|
<item name="android:switchStyle">@style/Switch.SettingsLib</item>
|
|
<item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item>
|
|
</style>
|
|
|
|
<!-- DayNight themes -->
|
|
<style name="GlifTheme.DayNight" parent="GlifTheme.Light" />
|
|
<style name="GlifV2Theme.DayNight" parent="GlifV2Theme.Light" />
|
|
<style name="GlifV3Theme.DayNight" parent="GlifV3Theme.Light" />
|
|
<style name="GlifV3Theme.DayNight.NoActionBar" parent="GlifV3Theme.Light.NoActionBar" />
|
|
<style name="GlifV2Theme.DayNight.Transparent" parent="GlifV2Theme.Light.Transparent" />
|
|
<style name="GlifV3Theme.DayNight.Transparent" parent="GlifV3Theme.Light.Transparent" />
|
|
<style name="SetupWizardTheme.DayNight.Transparent" parent="SetupWizardTheme.Light.Transparent" />
|
|
<style name="SuwAlertDialogThemeCompat.DayNight" parent="SuwAlertDialogThemeCompat.Light" />
|
|
</resources>
|