From b759790da18073c8cf45051b4482e4197cea717b Mon Sep 17 00:00:00 2001 From: menghanli Date: Thu, 3 Mar 2022 05:18:10 +0800 Subject: [PATCH] Apply Glif theme before using dynamic color. As changes are being made to remove the dependency between dynamic color and the glifv3 theme, this sets the Glif theme before calling trySetDymanicColor, as requested. Bug: 219882220 Test: Build & flash; visual inspection Change-Id: I4c28ea52411f3436c98e4689c7fa1784254fd572 --- .../AccessibilitySettingsForSetupWizardActivity.java | 3 +-- src/com/android/settings/core/SettingsBaseActivity.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java index 7a28e3917e0..058b6432d0d 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java @@ -110,13 +110,12 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit } 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); - } else { - setTheme(SetupWizardUtils.getTheme(this, getIntent())); } } diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java index 72770be7f09..12bada2b0d7 100644 --- a/src/com/android/settings/core/SettingsBaseActivity.java +++ b/src/com/android/settings/core/SettingsBaseActivity.java @@ -95,13 +95,12 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa // Apply SetupWizard light theme during setup flow. This is for SubSettings pages. 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); - } else { - setTheme(SetupWizardUtils.getTheme(this, getIntent())); } }