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

Commit 3b17116d authored by Edgar Wang's avatar Edgar Wang
Browse files

SettingsActivity should only apply Expressive theme when enabled 

If expressive theme is not enabled, then it should not attempt to apply
the expressive theme, and should instead use the default theme.

Bug: 409944934
Test: manual
Flag: EXEMPT bug fix
Change-Id: Iebc9c01a9ba32dd1e74a31ce4c4ae7f4e67896c0
parent 4de0c3ea

src/com/android/settings/SettingsActivity.java

+3 −4
Original line number Diff line number Diff line
@@ -518,10 +518,9 @@ public class SettingsActivity extends SettingsBaseActivity 
    @Override

    public Theme getTheme() {

        Theme theme = super.getTheme();

        theme.applyStyle(

                SettingsThemeHelper.isExpressiveTheme(this)

                        ? R.style.Theme_SubSettings_Expressive

                        : R.style.Theme_SubSettings, true);

        if (SettingsThemeHelper.isExpressiveTheme(this)) {

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

        }

        return theme;

    }