From 3aff4b1513f1d1e89d96ef27a25783dc5b81be03 Mon Sep 17 00:00:00 2001 From: cnchen Date: Fri, 4 Mar 2022 11:58:26 +0800 Subject: [PATCH] Add dynamic color support (before)https://hsv.googleplex.com/6220707954425856 (after)https://hsv.googleplex.com/6270261408038912 Bug: 209889556 Test: see the hsv above Change-Id: Ifee0392c189dbe7210ba2561355e2c275e7cb7fe --- .../wifi/dpp/WifiDppBaseActivity.java | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java b/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java index f55960be5e0..938d224c5a1 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java +++ b/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java @@ -26,6 +26,8 @@ import com.android.settings.R; import com.android.settings.SetupWizardUtils; import com.android.settings.core.InstrumentedActivity; +import com.google.android.setupdesign.util.ThemeHelper; + public abstract class WifiDppBaseActivity extends InstrumentedActivity { protected FragmentManager mFragmentManager; @@ -35,6 +37,8 @@ public abstract class WifiDppBaseActivity extends InstrumentedActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + applyTheme(); + setContentView(R.layout.wifi_dpp_activity); mFragmentManager = getSupportFragmentManager(); @@ -45,8 +49,18 @@ public abstract class WifiDppBaseActivity extends InstrumentedActivity { @Override protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) { - final int new_resid = SetupWizardUtils.getTheme(this, getIntent()); - theme.applyStyle(R.style.SetupWizardPartnerResource, /* force */ true); - super.onApplyThemeResource(theme, new_resid, first); + theme.applyStyle(R.style.SetupWizardPartnerResource, true); + super.onApplyThemeResource(theme, resid, first); + } + + private void applyTheme() { + if (ThemeHelper.trySetDynamicColor(this)) { + final int appliedTheme = ThemeHelper.isSetupWizardDayNightEnabled(this) + ? R.style.SudDynamicColorThemeSettings_SetupWizard_DayNight + : R.style.SudDynamicColorThemeSettings_SetupWizard; + setTheme(appliedTheme); + } else { + setTheme(SetupWizardUtils.getTheme(this, getIntent())); + } } }