Merge "Fix background inconsistency of the font size page in SUW" into sc-dev
diff --git a/res/drawable/preview_seek_bar_outline.xml b/res/drawable/preview_seek_bar_outline.xml
index ef8b8c7..e626e37 100644
--- a/res/drawable/preview_seek_bar_outline.xml
+++ b/res/drawable/preview_seek_bar_outline.xml
@@ -24,7 +24,7 @@
android:shape="rectangle" >
<stroke
android:width="@dimen/preview_pager_padding"
- android:color="?android:attr/colorPrimary" />
+ android:color="?android:attr/colorBackground" />
</shape>
</item>
<item
@@ -35,7 +35,7 @@
android:shape="rectangle"
android:height="?android:attr/actionBarSize" >
<solid
- android:color="?android:attr/colorPrimary" />
+ android:color="?android:attr/colorBackground" />
</shape>
</item>
</layer-list>
diff --git a/res/values-night/themes_suw.xml b/res/values-night/themes_suw.xml
index dea7b1a..ee0dd67 100644
--- a/res/values-night/themes_suw.xml
+++ b/res/values-night/themes_suw.xml
@@ -17,6 +17,9 @@
<!-- SUW related themes -->
<resources>
+ <!-- This theme was applied to Settings pages which are running under SUW. -->
+ <style name="SubSettings.SetupWizard" parent="SudThemeGlifV3" />
+
<!-- DayNight themes -->
<style name="GlifTheme.DayNight" parent="GlifTheme" />
<style name="GlifV2Theme.DayNight" parent="GlifV2Theme" />
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 0bd7c5b..b5f71fa 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -243,20 +243,6 @@
<item name="android:textColorSecondary">@*android:color/secondary_text_light</item>
</style>
- <!-- Light theme for those pages inherit SubSettings and launched during setup flow -->
- <style name="LightTheme.SubSettings.SetupWizard" parent="@android:style/Theme.DeviceDefault.Light">
- <item name="android:windowLightStatusBar">true</item>
- <item name="android:statusBarColor">@android:color/white</item>
- <item name="android:navigationBarColor">@android:color/white</item>
- <item name="android:windowLightNavigationBar">true</item>
- <item name="android:windowBackground">@android:color/white</item>
- <item name="android:navigationBarDividerColor">@*android:color/navigation_bar_divider_device_default_settings</item>
-
- <item name="android:colorPrimary">@android:color/white</item>
- <item name="android:colorBackground">@android:color/white</item>
- <item name="android:colorPrimaryDark">@android:color/white</item>
- <item name="android:colorAccent">@color/material_blue_700</item>
- </style>
<!-- Material theme for the pages containing TabLayout and ViewPager -->
<style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">
<item name="colorPrimary">@*android:color/edge_effect_device_default_light</item>
diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index deed9c6..d7b4ca0 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -220,6 +220,9 @@
<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
</style>
+ <!-- This theme was applied to Settings pages which are running under SUW. -->
+ <style name="SubSettings.SetupWizard" parent="SudThemeGlifV3.Light" />
+
<!-- DayNight themes -->
<style name="GlifTheme.DayNight" parent="GlifTheme.Light" />
<style name="GlifV2Theme.DayNight" parent="GlifV2Theme.Light" />
diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
index e0e41de..cf3cd50 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -48,6 +48,7 @@
import com.google.android.material.appbar.CollapsingToolbarLayout;
import com.google.android.setupcompat.util.WizardManagerHelper;
+import com.google.android.setupdesign.util.ThemeHelper;
import java.util.ArrayList;
import java.util.List;
@@ -87,7 +88,9 @@
// Apply SetupWizard light theme during setup flow. This is for SubSettings pages.
final boolean isAnySetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
if (isAnySetupWizard && this instanceof SubSettings) {
- setTheme(R.style.LightTheme_SubSettings_SetupWizard);
+ final int appliedTheme = ThemeHelper.isSetupWizardDayNightEnabled(this)
+ ? R.style.SubSettings_SetupWizard : R.style.SudThemeGlifV3_Light;
+ setTheme(appliedTheme);
}
if (FeatureFlagUtils.isEnabled(this, FeatureFlags.SILKY_HOME)
@@ -197,6 +200,7 @@
/**
* SubSetting page should show a toolbar by default. If the page wouldn't show a toolbar,
* override this method and return false value.
+ *
* @return ture by default
*/
protected boolean isToolbarEnabled() {