From e18c419f9417e3b21939dfb1246abc5b8d38df2f Mon Sep 17 00:00:00 2001
From: menghanli <menghanli@google.com>
Date: Mon, 5 Jul 2021 19:52:22 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20toggle=20display=20and=20preferen=20style?=
 =?UTF-8?q?=20old=20style=20and=20barely=20seen=20in=20=E2=80=9CVision=20S?=
 =?UTF-8?q?ettings=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Root cause: Apply ThemeHelper.trySetDynamicColor would overlay the
settings style.
Solution: Create SudDynamicColorThemeSettings.SetupWizard to support
dynamicColor and settings style.

Bug: 192410829
Test: manual test
Change-Id: Ic196dfe417e7f804c68ed4ea7bc05b4716999bcf
---
 res/values/themes_suw.xml                      | 18 ++++++++++++++++++
 ...sibilitySettingsForSetupWizardActivity.java | 14 ++++++++++++--
 .../settings/core/SettingsBaseActivity.java    | 13 ++++++++++---
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index d7b4ca06b67..067ddfb558c 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -223,6 +223,24 @@
     <!-- This theme was applied to Settings pages which are running under SUW. -->
     <style name="SubSettings.SetupWizard" parent="SudThemeGlifV3.Light" />
 
+    <!-- This theme was applied to Settings pages which are running under SUW with DynamicColor. -->
+    <style name="SudDynamicColorThemeSettings.SetupWizard" parent="SudDynamicColorThemeGlifV3.Light">
+        <item name="android:textAppearanceListItem">@style/TextAppearance.PreferenceTitle.SettingsLib</item>
+        <item name="android:listPreferredItemPaddingStart">24dp</item>
+        <item name="android:listPreferredItemPaddingEnd">16dp</item>
+        <item name="preferenceTheme">@style/PreferenceTheme.SettingsLib</item>
+        <item name="android:switchStyle">@style/Switch.SettingsLib</item>
+    </style>
+
+    <!-- This theme was applied to Settings pages which are running under SUW with DynamicColor. -->
+    <style name="SudDynamicColorThemeSettings.SetupWizard.DayNight" parent="SudDynamicColorThemeGlifV3.DayNight">
+        <item name="android:textAppearanceListItem">@style/TextAppearance.PreferenceTitle.SettingsLib</item>
+        <item name="android:listPreferredItemPaddingStart">24dp</item>
+        <item name="android:listPreferredItemPaddingEnd">16dp</item>
+        <item name="preferenceTheme">@style/PreferenceTheme.SettingsLib</item>
+        <item name="android:switchStyle">@style/Switch.SettingsLib</item>
+    </style>
+
     <!-- DayNight themes -->
     <style name="GlifTheme.DayNight" parent="GlifTheme.Light" />
     <style name="GlifV2Theme.DayNight" parent="GlifV2Theme.Light" />
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
index 48b3992b685..b65b349707c 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
@@ -101,12 +101,22 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit
     @Override
     protected void onCreate(Bundle savedState) {
         super.onCreate(savedState);
-        setTheme(SetupWizardUtils.getTheme(this, getIntent()));
-        ThemeHelper.trySetDynamicColor(this);
+        applyTheme();
         tryLaunchFontSizeSettings();
         findViewById(R.id.content_parent).setFitsSystemWindows(false);
     }
 
+    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()));
+        }
+    }
+
     @VisibleForTesting
     void tryLaunchFontSizeSettings() {
         if (WizardManagerHelper.isAnySetupWizard(getIntent())
diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
index e8a7f36908a..ceb502ae327 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -91,10 +91,17 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
         // Apply SetupWizard light theme during setup flow. This is for SubSettings pages.
         final boolean isAnySetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
         if (isAnySetupWizard && this instanceof SubSettings) {
-            final int appliedTheme = ThemeHelper.isSetupWizardDayNightEnabled(this)
-                    ? R.style.SubSettings_SetupWizard : R.style.SudThemeGlifV3_Light;
+            int appliedTheme;
+            if (ThemeHelper.trySetDynamicColor(this)) {
+                appliedTheme = ThemeHelper.isSetupWizardDayNightEnabled(this)
+                        ? R.style.SudDynamicColorThemeSettings_SetupWizard_DayNight
+                        : R.style.SudDynamicColorThemeSettings_SetupWizard;
+            } else {
+                appliedTheme = ThemeHelper.isSetupWizardDayNightEnabled(this)
+                        ? R.style.SubSettings_SetupWizard
+                        : R.style.SudThemeGlifV3_Light;
+            }
             setTheme(appliedTheme);
-            ThemeHelper.trySetDynamicColor(this);
         }
 
         if (isToolbarEnabled() && !isAnySetupWizard) {