From 2ba1ab222295bc66fc7c1e98a4dd6ae83277d2e0 Mon Sep 17 00:00:00 2001
From: Sunny Shao <sunnyshao@google.com>
Date: Fri, 23 Apr 2021 13:32:52 +0800
Subject: [PATCH] Fix background inconsistency of the font size page in SUW

- Apply to SUW provided theme.
- Use isSetupWizardDayNightEnabled to decide which device's SUW supports dark mode.

Fixes: 184901818
Bug: 186076332
Test: manual test
Change-Id: I44c5f8ee19dac58dea7f5543840659c08aad4a39
---
 res/drawable/preview_seek_bar_outline.xml          |  4 ++--
 res/values-night/themes_suw.xml                    |  3 +++
 res/values/themes.xml                              | 14 --------------
 res/values/themes_suw.xml                          |  3 +++
 .../settings/core/SettingsBaseActivity.java        |  6 +++++-
 5 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/res/drawable/preview_seek_bar_outline.xml b/res/drawable/preview_seek_bar_outline.xml
index ef8b8c72ed2..e626e37e700 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 dea7b1a5f78..ee0dd67939b 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 02f94d2fe54..5142d55d00c 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 deed9c63863..d7b4ca06b67 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 569e4805b8d..a9513eaafcd 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -48,6 +48,7 @@ import com.android.settingslib.drawer.Tile;
 
 import com.google.android.material.appbar.CollapsingToolbarLayout;
 import com.google.android.setupcompat.util.WizardManagerHelper;
+import com.google.android.setupdesign.util.ThemeHelper;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -90,7 +91,9 @@ public class SettingsBaseActivity extends FragmentActivity {
         // 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)
@@ -201,6 +204,7 @@ public class SettingsBaseActivity extends FragmentActivity {
     /**
      * 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() {