Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57ced74d authored Mar 03, 2022 by Menghan Li Committed by Android (Google) Code Review Mar 03, 2022

Merge "Apply Glif theme before using dynamic color." into tm-dev

parents cdb08ee9 b759790d

src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -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()));
		}
		}

src/com/android/settings/core/SettingsBaseActivity.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -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()));
		}
		}