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

Commit 4aee4e6a authored by Edgar Wang's avatar Edgar Wang
Browse files

Respect the Theme set when launching from SetupWizard 

Bug: 408112547
Bug: 407600608
Bug: 400479388
Bug: 410996988

Test: visually
Flag: EXEMPT bugfix low risk
Change-Id: I403547fef2db6eefb2d48316de81bfda998c4819
parent 44215796

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;