Properly apply the SUW dynamic color theme
Activity should apply a base theme before apply dynamic color theme
Bug: 225800660
Test: Manual testing
Change-Id: Iad6e03b1750e1a4bd29878c9eb88e8c4a08a867f
diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index 1755d2a..78daa4a 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -224,26 +224,6 @@
<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>
diff --git a/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java b/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java
index 938d224..744cfc0 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java
@@ -54,13 +54,8 @@
}
private void applyTheme() {
- if (ThemeHelper.trySetDynamicColor(this)) {
- final int appliedTheme = ThemeHelper.isSetupWizardDayNightEnabled(this)
- ? R.style.SudDynamicColorThemeSettings_SetupWizard_DayNight
- : R.style.SudDynamicColorThemeSettings_SetupWizard;
- setTheme(appliedTheme);
- } else {
- setTheme(SetupWizardUtils.getTheme(this, getIntent()));
- }
+ setTheme(SetupWizardUtils.getTheme(this, getIntent()));
+ setTheme(R.style.SettingsPreferenceTheme_SetupWizard);
+ ThemeHelper.trySetDynamicColor(this);
}
}