Merge "Remove dependency of SudGlifTheme from SettingsTheme" into tm-dev am: 1031406227 am: b08cb9b548

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465488

Change-Id: Idfa32f4657f414bc61a39d7407ab941ed8fb4c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Menghan Li
2022-04-01 06:24:01 +00:00
committed by Automerger Merge Worker
3 changed files with 14 additions and 12 deletions

View File

@@ -102,11 +102,7 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit
private void applyTheme() {
setTheme(SetupWizardUtils.getTheme(this, getIntent()));
if (ThemeHelper.trySetDynamicColor(this)) {
final int appliedTheme = ThemeHelper.isSetupWizardDayNightEnabled(this)
? R.style.SudDynamicColorThemeSettings_SetupWizard_DayNight
: R.style.SudDynamicColorThemeSettings_SetupWizard;
setTheme(appliedTheme);
}
setTheme(R.style.SettingsPreferenceTheme_SetupWizard);
ThemeHelper.trySetDynamicColor(this);
}
}