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

Commit 712df6cb authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Fix the way we select and apply Themes 

- do not override the DialogWhenLarge ones (they have their purpose)
- apply the correct Theme to SubSettings and then as a consequence
to the SwitchBar

Change-Id: I83adabf72da03051f03fbd2121e1e71217fc0c6a
parent d40dd45c

src/com/android/settings/SettingsActivity.java

+9 −4
Original line number Diff line number Diff line
@@ -482,12 +482,17 @@ public class SettingsActivity extends Activity 
        mIsShowingDashboard = className.equals(Settings.class.getName());

        final boolean isSubSettings = className.equals(SubSettings.class.getName());



        // If this is a sub settings or not the main Dashboard and not a Shortcut and not initial

        // Fragment then apply the correct theme for the ActionBar content inset

        // If this is a sub settings or not the main Dashboard and not a Shortcut and an initial

        // Fragment then apply the SubSettings theme for the ActionBar content insets

        if (isSubSettings ||

                (!mIsShowingDashboard && !mIsShortcut && (initialFragmentName == null))) {

                (!mIsShowingDashboard && !mIsShortcut && (initialFragmentName != null))) {

            // Check also that we are not a Theme Dialog as we don't want to override them

            final int themeResId = getThemeResId();

            if (themeResId != R.style.Theme_DialogWhenLarge &&

                    themeResId != R.style.Theme_SubSettingsDialogWhenLarge) {

                setTheme(R.style.Theme_SubSettings);

            }

        }



        setContentView(mIsShowingDashboard ?

                R.layout.settings_main_dashboard : R.layout.settings_main_prefs);