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

Commit dd2ec775 authored by menghanli's avatar menghanli
Browse files

Add a done button to vision setting pages in setup flow 

Root cause: User feels confused because the particular screen doesn't have a back button but at that moment of the setup flow the regular UI gestures didn't even work.
Solution: Add a done button to the vision settings pages for clearer navigation.

Bug: 262995569
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FragmentForSetupWizardTest
Change-Id: Id3a0d78389e0e6c11b5b5cf016b37673fde7f286
parent d3ff83eb

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

+9 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settings.accessibility;



import static android.app.Activity.RESULT_CANCELED;



import static com.android.settings.Utils.getAdaptiveIcon;

import static com.android.settingslib.widget.TwoTargetPreference.ICON_SIZE_MEDIUM;
@@ -41,6 +43,7 @@ import com.android.settings.R; 
import com.android.settings.dashboard.DashboardFragment;

import com.android.settingslib.RestrictedPreference;



import com.google.android.setupcompat.template.FooterBarMixin;

import com.google.android.setupdesign.GlifPreferenceLayout;



import java.util.List;
@@ -90,6 +93,12 @@ public class AccessibilitySettingsForSetupWizard extends DashboardFragment 
        final Drawable icon = getContext().getDrawable(R.drawable.ic_accessibility_visibility);

        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();

        });

    }



    @Override

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

+48 −1
Original line number Diff line number Diff line
@@ -19,8 +19,13 @@ import android.content.Context; 
import android.graphics.drawable.Drawable;

import android.widget.LinearLayout;



import androidx.annotation.StringRes;



import com.android.settings.R;



import com.google.android.setupcompat.template.FooterBarMixin;

import com.google.android.setupcompat.template.FooterButton;

import com.google.android.setupcompat.template.Mixin;

import com.google.android.setupdesign.GlifPreferenceLayout;

import com.google.android.setupdesign.util.ThemeHelper;
@@ -30,7 +35,7 @@ class AccessibilitySetupWizardUtils { 
    private AccessibilitySetupWizardUtils(){}



    /**

     * Update the {@link GlifPreferenceLayout} attributes if they have previously been initialized.

     * Updates the {@link GlifPreferenceLayout} attributes if they have previously been initialized.

     * When the SetupWizard supports the extended partner configs, it means the material layout

     * would be applied. It should set a different padding/margin in views to align Settings style

     * for accessibility feature pages.
@@ -55,4 +60,46 @@ class AccessibilitySetupWizardUtils { 
            }

        }

    }



    /**

     * Sets primary button for footer of the {@link GlifPreferenceLayout}.

     *

     * <p> This will be the initial by given material theme style.

     *

     * @param context A {@link Context}

     * @param mixin A {@link Mixin} for managing buttons.

     * @param text The {@code text} by resource.

     * @param runnable The {@link Runnable} to run.

     */

    public static void setPrimaryButton(Context context, FooterBarMixin mixin, @StringRes int text,

            Runnable runnable) {

        mixin.setPrimaryButton(

                new FooterButton.Builder(context)

                        .setText(text)

                        .setListener(l -> runnable.run())

                        .setButtonType(FooterButton.ButtonType.DONE)

                        .setTheme(R.style.SudGlifButton_Primary)

                        .build());

    }



    /**

     * Sets secondary button for the footer of the {@link GlifPreferenceLayout}.

     *

     * <p> This will be the initial by given material theme style.

     *

     * @param context A {@link Context}

     * @param mixin A {@link Mixin} for managing buttons.

     * @param text The {@code text} by resource.

     * @param runnable The {@link Runnable} to run.

     */

    public static void setSecondaryButton(Context context, FooterBarMixin mixin,

            @StringRes int text, Runnable runnable) {

        mixin.setSecondaryButton(

                new FooterButton.Builder(context)

                        .setText(text)

                        .setListener(l -> runnable.run())

                        .setButtonType(FooterButton.ButtonType.CLEAR)

                        .setTheme(R.style.SudGlifButton_Secondary)

                        .build());

    }

}

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

+8 −21
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import com.android.settings.R; 
import com.android.settingslib.Utils;



import com.google.android.setupcompat.template.FooterBarMixin;

import com.google.android.setupcompat.template.FooterButton;

import com.google.android.setupdesign.GlifPreferenceLayout;



/**
@@ -55,26 +54,14 @@ public class TextReadingPreferenceFragmentForSetupWizard extends TextReadingPref 
                /* description= */ null, icon);



        final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);

        mixin.setSecondaryButton(

                new FooterButton.Builder(getContext())

                        .setText(R.string.accessibility_text_reading_reset_button_title)

                        .setListener(l -> showDialog(DIALOG_RESET_SETTINGS))

                        .setButtonType(FooterButton.ButtonType.CLEAR)

                        .setTheme(R.style.SudGlifButton_Secondary)

                        .build());



        if (isCallingFromAnythingElseEntryPoint()) {

            mixin.setPrimaryButton(

                    new FooterButton.Builder(getContext())

                            .setText(R.string.done)

                            .setListener(l -> {

        AccessibilitySetupWizardUtils.setPrimaryButton(getContext(), mixin, R.string.done, () -> {

            setResult(RESULT_CANCELED);

            finish();

                            })

                            .setButtonType(FooterButton.ButtonType.DONE)

                            .setTheme(R.style.SudGlifButton_Primary)

                            .build());

        }

        });

        AccessibilitySetupWizardUtils.setSecondaryButton(getContext(), mixin,

                R.string.accessibility_text_reading_reset_button_title,

                () -> showDialog(DIALOG_RESET_SETTINGS)

        );

    }



    @Override

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

+10 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settings.accessibility;



import static android.app.Activity.RESULT_CANCELED;



import android.app.settings.SettingsEnums;

import android.graphics.drawable.Drawable;

import android.os.Bundle;
@@ -27,6 +29,7 @@ import androidx.recyclerview.widget.RecyclerView; 


import com.android.settings.R;



import com.google.android.setupcompat.template.FooterBarMixin;

import com.google.android.setupdesign.GlifPreferenceLayout;



public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard
@@ -44,6 +47,13 @@ public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard 
        final Drawable icon = getContext().getDrawable(R.drawable.ic_accessibility_visibility);

        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();

        });



        hidePreferenceSettingComponents();

    }

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

+9 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settings.accessibility;



import static android.app.Activity.RESULT_CANCELED;



import android.app.settings.SettingsEnums;

import android.graphics.drawable.Drawable;

import android.os.Bundle;
@@ -27,6 +29,7 @@ import androidx.recyclerview.widget.RecyclerView; 


import com.android.settings.R;



import com.google.android.setupcompat.template.FooterBarMixin;

import com.google.android.setupdesign.GlifPreferenceLayout;



public class ToggleScreenReaderPreferenceFragmentForSetupWizard
@@ -45,6 +48,12 @@ public class ToggleScreenReaderPreferenceFragmentForSetupWizard 
        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();

        });



        mToggleSwitchWasInitiallyChecked = mToggleServiceSwitchPreference.isChecked();

        if (mTopIntroPreference != null) {

            mTopIntroPreference.setVisible(false);