diff options
| author | Cn Chen <cnchen@google.com> | 2019-05-14 07:18:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-14 07:18:03 +0000 |
| commit | 421a05a6a94d17469df8614bdd3a1614798c16f6 (patch) | |
| tree | b5672852ee03d11f1ac2ee6582cb19e9ebefc8e1 /src/com/android/settings/SettingsActivity.java | |
| parent | 9a252aa6b54b4ea45c554725c8d0adfdb954bc98 (diff) | |
| parent | 3eee5cf02e5fda758a1f5e471648d9838a299187 (diff) | |
| download | packages_apps_Settings-421a05a6a94d17469df8614bdd3a1614798c16f6.tar.gz packages_apps_Settings-421a05a6a94d17469df8614bdd3a1614798c16f6.tar.bz2 packages_apps_Settings-421a05a6a94d17469df8614bdd3a1614798c16f6.zip | |
Merge "Font size page support light theme in deferred setup" into qt-dev
Diffstat (limited to 'src/com/android/settings/SettingsActivity.java')
| -rw-r--r-- | src/com/android/settings/SettingsActivity.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 54c822e56a..3b01b327ea 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -65,6 +65,8 @@ import com.android.settingslib.core.instrumentation.SharedPreferencesLogger; import com.android.settingslib.development.DevelopmentSettingsEnabler; import com.android.settingslib.drawer.DashboardCategory; +import com.google.android.setupcompat.util.WizardManagerHelper; + import java.util.ArrayList; import java.util.List; @@ -239,8 +241,10 @@ public class SettingsActivity extends SettingsBaseActivity 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 (isSubSettings) { + // insets. + // If this is in setup flow, don't apply theme. Because light theme needs to be applied + // in SettingsBaseActivity#onCreate(). + if (isSubSettings && !WizardManagerHelper.isAnySetupWizard(getIntent())) { setTheme(R.style.Theme_SubSettings); } |