Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d13dc6a1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 5e5a48d5 91538bb9

src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -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);

        }

    }

}

src/com/android/settings/accessibility/AccessibilitySetupWizardUtils.java

+0 −2
Original line number Diff line number Diff line
@@ -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());

    }

}

src/com/android/settings/core/SettingsBaseActivity.java

+1 −3
Original line number Diff line number Diff line
@@ -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) {