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

Merge "Fix the way we select and apply Themes" into lmp-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-07-19 00:53:02 +00:00
committed by Android (Google) Code Review
parent 84dfc0b5d6 712df6cb70
commit 39a2cbb32c
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -482,11 +482,16 @@ 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))) {
setTheme(R.style.Theme_SubSettings); // 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 ? setContentView(mIsShowingDashboard ?