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

Commit b759790d authored by menghanli's avatar menghanli
Browse files

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
parent 2164070f

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()));

            }

        }