From f257978cee9523ad286186a8b639aa5adb7a8d7a Mon Sep 17 00:00:00 2001 From: Daniel Norman Date: Fri, 14 Mar 2025 11:17:17 -0700 Subject: [PATCH] feat(expressive): Remove the `Done` button for expressive SUW on Vision settings. This button is not included in expressive SUW mocks on this page. Fix: 346560989 Test: visual-only change; observe button is gone Flag: EXEMPT using custom SUW expressive flagging Change-Id: I0bb0379241c941b29151c5cf5f25ad130cc5a8ed --- .../AccessibilitySettingsForSetupWizard.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java index 11cbd1678b3..c6ab8377461 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java @@ -47,6 +47,7 @@ import com.android.settingslib.core.AbstractPreferenceController; import com.google.android.setupcompat.template.FooterBarMixin; import com.google.android.setupdesign.GlifPreferenceLayout; +import com.google.android.setupdesign.util.ThemeHelper; import java.util.ArrayList; import java.util.List; @@ -98,12 +99,14 @@ public class AccessibilitySettingsForSetupWizard extends DashboardFragment AccessibilitySetupWizardUtils.updateGlifPreferenceLayout(getContext(), layout, title, description, icon); - final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class); - AccessibilitySetupWizardUtils.setPrimaryButton(getContext(), mixin, R.string.done, - () -> { - setResult(RESULT_CANCELED); - finish(); - }); + if (!ThemeHelper.shouldApplyGlifExpressiveStyle(getContext())) { + final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class); + AccessibilitySetupWizardUtils.setPrimaryButton(getContext(), mixin, R.string.done, + () -> { + setResult(RESULT_CANCELED); + finish(); + }); + } } }