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

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

Merge "SettingsActivity should only apply Expressive theme when enabled" into main

parents a7151699 3b17116d

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;

    }