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

Commit 24f982e7 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "Respect the Theme set when launching from SetupWizard" into main

parents ebfd5458 4aee4e6a

src/com/android/settings/SettingsActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -518,7 +518,8 @@ public class SettingsActivity extends SettingsBaseActivity 
    @Override

    public Theme getTheme() {

        Theme theme = super.getTheme();

        if (SettingsThemeHelper.isExpressiveTheme(this)) {

        if (!WizardManagerHelper.isAnySetupWizard(getIntent())

                && SettingsThemeHelper.isExpressiveTheme(this)) {

            theme.applyStyle(R.style.Theme_SubSettings_Expressive, true);

        }

        return theme;