PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the way we select and apply Themes

Browse Source 
- 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
This commit is contained in:
Fabrice Di Meglio
2014-07-18 17:44:37 -07:00
parent d40dd45c18
commit 712df6cb70
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/SettingsActivity.java
View File

@@ -482,12 +482,17 @@ public class SettingsActivity extends Activity
mIsShowingDashboard = className.equals(Settings.class.getName()); mIsShowingDashboard = className.equals(Settings.class.getName());
final boolean isSubSettings = className.equals(SubSettings.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 // If this is a sub settings or not the main Dashboard and not a Shortcut and an initial
// Fragment then apply the correct theme for the ActionBar content inset // Fragment then apply the SubSettings theme for the ActionBar content insets
if (isSubSettings || 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); setTheme(R.style.Theme_SubSettings);
} }
}
setContentView(mIsShowingDashboard ? setContentView(mIsShowingDashboard ?
R.layout.settings_main_dashboard : R.layout.settings_main_prefs); R.layout.settings_main_dashboard : R.layout.settings_main_prefs);