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

Merge "Misc fix on settings themes."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-21 21:17:49 +00:00
committed by Android (Google) Code Review
parent 48717f5c2d 92f1e942da
commit fac57416b8
5 changed files with 11 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -387,14 +387,10 @@ public class SettingsActivity extends SettingsDrawerActivity
final boolean isSubSettings = this instanceof SubSettings ||
intent.getBooleanExtra(EXTRA_SHOW_FRAGMENT_AS_SUBSETTING, false);
// If this is a sub settings, then apply the SubSettings Theme for the ActionBar content insets
// If this is a sub settings, then apply the SubSettings Theme for the ActionBar content
// insets
if (isSubSettings) {
// 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 ?