Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix(SUW): Update A11y Settings pages to use new expressive style" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-02-28 16:26:49 -08:00
committed by Android (Google) Code Review
parent 5e5a48d560 91538bb9ac
commit d13dc6a1b7
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
View File

@@ -97,9 +97,8 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit
private void applyTheme() { private void applyTheme() {
final boolean isAnySetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent()); final boolean isAnySetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
if (isAnySetupWizard) { if (isAnySetupWizard) {
setTheme(SetupWizardUtils.getTheme(this, getIntent()));
setTheme(R.style.SettingsPreferenceTheme_SetupWizard); setTheme(R.style.SettingsPreferenceTheme_SetupWizard);
ThemeHelper.trySetDynamicColor(this); ThemeHelper.trySetSuwTheme(this);
} }
} }
} }

2
src/com/android/settings/accessibility/AccessibilitySetupWizardUtils.java
View File

@@ -99,7 +99,6 @@ public class AccessibilitySetupWizardUtils {
.setText(text) .setText(text)
.setListener(l -> runnable.run()) .setListener(l -> runnable.run())
.setButtonType(FooterButton.ButtonType.DONE) .setButtonType(FooterButton.ButtonType.DONE)
.setTheme(R.style.SudGlifButton_Primary)
.build()); .build());
} }
@@ -120,7 +119,6 @@ public class AccessibilitySetupWizardUtils {
.setText(text) .setText(text)
.setListener(l -> runnable.run()) .setListener(l -> runnable.run())
.setButtonType(FooterButton.ButtonType.CLEAR) .setButtonType(FooterButton.ButtonType.CLEAR)
.setTheme(R.style.SudGlifButton_Secondary)
.build()); .build());
} }
} }

4
src/com/android/settings/core/SettingsBaseActivity.java
View File

@@ -40,7 +40,6 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.SubSettings; import com.android.settings.SubSettings;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.core.CategoryMixin.CategoryHandler; 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. // Apply SetupWizard light theme during setup flow. This is for SubSettings pages.
if (isAnySetupWizard && this instanceof SubSettings) { if (isAnySetupWizard && this instanceof SubSettings) {
setTheme(SetupWizardUtils.getTheme(this, getIntent()));
setTheme(R.style.SettingsPreferenceTheme_SetupWizard); setTheme(R.style.SettingsPreferenceTheme_SetupWizard);
ThemeHelper.trySetDynamicColor(this); ThemeHelper.trySetSuwTheme(this);
} }
if (isToolbarEnabled() && !isAnySetupWizard) { if (isToolbarEnabled() && !isAnySetupWizard) {