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

Commit 650f4e1d authored by Mill Chen's avatar Mill Chen
Browse files

[Expressive design] Fix theme issues 

The theme was not applied properly when switching dark theme/light theme
or rotating the device.

Bug: 397112596
Fix: 405827971
Test: manual test
Flag: EXEMPT bugfix
Change-Id: I7ee9b92006041ef92d28bdaf717947dd4335045b
parent 4320d48f

src/com/android/settings/SettingsActivity.java

+11 −0
Original line number Diff line number Diff line
@@ -508,6 +508,17 @@ public class SettingsActivity extends SettingsBaseActivity 
        super.onApplyThemeResource(theme, resid, first);

    }



    /** Returns the current theme and checks if needing to apply expressive theme. */

    @Override

    public Theme getTheme() {

        Theme theme = super.getTheme();

        theme.applyStyle(

                SettingsThemeHelper.isExpressiveTheme(this)

                        ? R.style.Theme_SubSettings_Expressive

                        : R.style.Theme_SubSettings, true);

        return theme;

    }



    @Override

    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {

        super.onActivityResult(requestCode, resultCode, data);