Remove dependency of SudGlifTheme from SettingsTheme
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
diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index 129769f..1755d2a 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -244,6 +244,16 @@
<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" />
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
index a7466da..e0a7ccc 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
@@ -102,11 +102,7 @@
private void applyTheme() {
setTheme(SetupWizardUtils.getTheme(this, getIntent()));
- if (ThemeHelper.trySetDynamicColor(this)) {
- final int appliedTheme = ThemeHelper.isSetupWizardDayNightEnabled(this)
- ? R.style.SudDynamicColorThemeSettings_SetupWizard_DayNight
- : R.style.SudDynamicColorThemeSettings_SetupWizard;
- setTheme(appliedTheme);
- }
+ setTheme(R.style.SettingsPreferenceTheme_SetupWizard);
+ ThemeHelper.trySetDynamicColor(this);
}
}
diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
index 12bada2..7842459 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -96,12 +96,8 @@
final boolean isAnySetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
if (isAnySetupWizard && this instanceof SubSettings) {
setTheme(SetupWizardUtils.getTheme(this, getIntent()));
- if (ThemeHelper.trySetDynamicColor(this)) {
- final int appliedTheme = ThemeHelper.isSetupWizardDayNightEnabled(this)
- ? R.style.SudDynamicColorThemeSettings_SetupWizard_DayNight
- : R.style.SudDynamicColorThemeSettings_SetupWizard;
- setTheme(appliedTheme);
- }
+ setTheme(R.style.SettingsPreferenceTheme_SetupWizard);
+ ThemeHelper.trySetDynamicColor(this);
}
if (isToolbarEnabled() && !isAnySetupWizard) {