From 91538bb9acb52fd753771ab68bc14d133aa2f358 Mon Sep 17 00:00:00 2001
From: Daniel Norman <danielnorman@google.com>
Date: Tue, 21 Jan 2025 21:28:29 +0000
Subject: [PATCH] fix(SUW): Update A11y Settings pages to use new expressive
 style

Bug: 346560989
Test: Keep flags disabled; observe no visual change
Test: Flip Setup and Settings flags; observe visual changes
      See bug for screenshots
Flag: EXEMPT using non-standard flagging from ThemeHelper
Change-Id: Ie81594dd113af38a03f4215e8bb5c928bcfb1ef5
---
 .../AccessibilitySettingsForSetupWizardActivity.java          | 3 +--
 .../settings/accessibility/AccessibilitySetupWizardUtils.java | 2 --
 src/com/android/settings/core/SettingsBaseActivity.java       | 4 +---
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
index 57047f9cde2..196102c2243 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
@@ -97,9 +97,8 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit
     private void applyTheme() {
         final boolean isAnySetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
         if (isAnySetupWizard) {
-            setTheme(SetupWizardUtils.getTheme(this, getIntent()));
             setTheme(R.style.SettingsPreferenceTheme_SetupWizard);
-            ThemeHelper.trySetDynamicColor(this);
+            ThemeHelper.trySetSuwTheme(this);
         }
     }
 }
diff --git a/src/com/android/settings/accessibility/AccessibilitySetupWizardUtils.java b/src/com/android/settings/accessibility/AccessibilitySetupWizardUtils.java
index 996cbdadf81..24204dd0c8e 100644
--- a/src/com/android/settings/accessibility/AccessibilitySetupWizardUtils.java
+++ b/src/com/android/settings/accessibility/AccessibilitySetupWizardUtils.java
@@ -99,7 +99,6 @@ public class AccessibilitySetupWizardUtils {
                         .setText(text)
                         .setListener(l -> runnable.run())
                         .setButtonType(FooterButton.ButtonType.DONE)
-                        .setTheme(R.style.SudGlifButton_Primary)
                         .build());
     }
 
@@ -120,7 +119,6 @@ public class AccessibilitySetupWizardUtils {
                         .setText(text)
                         .setListener(l -> runnable.run())
                         .setButtonType(FooterButton.ButtonType.CLEAR)
-                        .setTheme(R.style.SudGlifButton_Secondary)
                         .build());
     }
 }
diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
index 491ca5cce93..1ae325886c2 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -40,7 +40,6 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;
-import com.android.settings.SetupWizardUtils;
 import com.android.settings.SubSettings;
 import com.android.settings.Utils;
 import com.android.settings.core.CategoryMixin.CategoryHandler;
@@ -117,9 +116,8 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
         }
         // Apply SetupWizard light theme during setup flow. This is for SubSettings pages.
         if (isAnySetupWizard && this instanceof SubSettings) {
-            setTheme(SetupWizardUtils.getTheme(this, getIntent()));
             setTheme(R.style.SettingsPreferenceTheme_SetupWizard);
-            ThemeHelper.trySetDynamicColor(this);
+            ThemeHelper.trySetSuwTheme(this);
         }
 
         if (isToolbarEnabled() && !isAnySetupWizard) {