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

Commit af1f8ed6 authored by menghanli's avatar menghanli Committed by Automerger Merge Worker
Browse files

Add a done button to vision setting pages in setup flow am: 991b70c7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21414425



Change-Id: Ibb2f4831810685728481e6a9ba5073c3252b9968
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c6cbe0b6 991b70c7

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

+21 −7
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.settings.accessibility.AccessibilityUtil.AccessibilityServiceFragmentType.VOLUME_SHORTCUT_TOGGLE;

import static com.android.settingslib.widget.TwoTargetPreference.ICON_SIZE_MEDIUM;
@@ -34,6 +36,7 @@ import android.view.View; 
import android.view.ViewGroup;

import android.view.accessibility.AccessibilityManager;



import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.recyclerview.widget.RecyclerView;
@@ -41,6 +44,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;
@@ -59,17 +63,21 @@ public class AccessibilitySettingsForSetupWizard extends DashboardFragment 
    private static final String SELECT_TO_SPEAK_PREFERENCE = "select_to_speak_preference";



    // Package names and service names used to identify screen reader and SelectToSpeak services.

    private static final String SCREEN_READER_PACKAGE_NAME = "com.google.android.marvin.talkback";

    private static final String SCREEN_READER_SERVICE_NAME =

    @VisibleForTesting

    static final String SCREEN_READER_PACKAGE_NAME = "com.google.android.marvin.talkback";

    @VisibleForTesting

    static final String SCREEN_READER_SERVICE_NAME =

            "com.google.android.marvin.talkback.TalkBackService";

    private static final String SELECT_TO_SPEAK_PACKAGE_NAME = "com.google.android.marvin.talkback";

    private static final String SELECT_TO_SPEAK_SERVICE_NAME =

    @VisibleForTesting

    static final String SELECT_TO_SPEAK_PACKAGE_NAME = "com.google.android.marvin.talkback";

    @VisibleForTesting

    static final String SELECT_TO_SPEAK_SERVICE_NAME =

            "com.google.android.accessibility.selecttospeak.SelectToSpeakService";



    // Preference controls.

    private Preference mDisplayMagnificationPreference;

    private RestrictedPreference mScreenReaderPreference;

    private RestrictedPreference mSelectToSpeakPreference;

    protected Preference mDisplayMagnificationPreference;

    protected RestrictedPreference mScreenReaderPreference;

    protected RestrictedPreference mSelectToSpeakPreference;



    @Override

    public int getMetricsCategory() {
@@ -86,6 +94,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/TextReadingPreferenceFragment.java

+12 −12
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ package com.android.settings.accessibility; 


import static com.android.settings.accessibility.TextReadingResetController.ResetStateListener;



import android.app.Activity;

import android.app.Dialog;

import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;

import android.os.Bundle;

import android.widget.Toast;
@@ -36,13 +36,13 @@ import com.android.settings.search.BaseSearchIndexProvider; 
import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.search.SearchIndexable;



import com.google.android.setupcompat.util.WizardManagerHelper;

import com.google.common.annotations.VisibleForTesting;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.List;

import java.util.Set;

import java.util.stream.Collectors;



/**
@@ -53,8 +53,7 @@ import java.util.stream.Collectors; 
public class TextReadingPreferenceFragment extends DashboardFragment {

    public static final String EXTRA_LAUNCHED_FROM = "launched_from";

    private static final String TAG = "TextReadingPreferenceFragment";

    private static final String CATEGORY_FOR_ANYTHING_ELSE =

            "com.android.settings.suggested.category.DISPLAY_SETTINGS";

    private static final String SETUP_WIZARD_PACKAGE = "setupwizard";

    static final String FONT_SIZE_KEY = "font_size";

    static final String DISPLAY_SIZE_KEY = "display_size";

    static final String BOLD_TEXT_KEY = "toggle_force_bold_text";
@@ -156,6 +155,7 @@ public class TextReadingPreferenceFragment extends DashboardFragment { 
                new TextReadingResetController(context, RESET_KEY,

                        v -> showDialog(DialogEnums.DIALOG_RESET_SETTINGS));

        resetController.setEntryPoint(mEntryPoint);

        resetController.setVisible(!WizardManagerHelper.isAnySetupWizard(getIntent()));

        controllers.add(resetController);



        return controllers;
@@ -193,6 +193,13 @@ public class TextReadingPreferenceFragment extends DashboardFragment { 
        }

    }



    protected boolean isCallingFromAnythingElseEntryPoint() {

        final Activity activity = getActivity();

        final String callingPackage = activity != null ? activity.getCallingPackage() : null;



        return callingPackage != null && callingPackage.contains(SETUP_WIZARD_PACKAGE);

    }



    @VisibleForTesting

    DisplaySizeData createDisplaySizeData(Context context) {

        return new DisplaySizeData(context);
@@ -205,14 +212,7 @@ public class TextReadingPreferenceFragment extends DashboardFragment { 
            return;

        }



        final Intent intent = getIntent();

        if (intent == null) {

            mEntryPoint = EntryPoint.UNKNOWN_ENTRY;

            return;

        }



        final Set<String> categories = intent.getCategories();

        mEntryPoint = categories != null && categories.contains(CATEGORY_FOR_ANYTHING_ELSE)

        mEntryPoint = isCallingFromAnythingElseEntryPoint()

                ? EntryPoint.SUW_ANYTHING_ELSE : EntryPoint.UNKNOWN_ENTRY;

    }

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

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


package com.android.settings.accessibility;



import static android.app.Activity.RESULT_CANCELED;



import static com.android.settings.accessibility.AccessibilityDialogUtils.DialogEnums.DIALOG_RESET_SETTINGS;



import android.app.settings.SettingsEnums;

import android.graphics.drawable.Drawable;

import android.os.Bundle;
@@ -27,11 +31,9 @@ import androidx.recyclerview.widget.RecyclerView; 


import com.android.settings.R;

import com.android.settingslib.Utils;

import com.android.settingslib.widget.LayoutPreference;



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

import com.google.android.setupdesign.GlifPreferenceLayout;

import com.google.android.setupdesign.util.LayoutStyler;





/**

 * A {@link androidx.preference.PreferenceFragmentCompat} that displays the settings page related
@@ -51,7 +53,15 @@ public class TextReadingPreferenceFragmentForSetupWizard extends TextReadingPref 
        AccessibilitySetupWizardUtils.updateGlifPreferenceLayout(getContext(), layout, title,

                /* description= */ null, icon);



        updateResetButtonPadding();

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

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

            setResult(RESULT_CANCELED);

            finish();

        });

        AccessibilitySetupWizardUtils.setSecondaryButton(getContext(), mixin,

                R.string.accessibility_text_reading_reset_button_title,

                () -> showDialog(DIALOG_RESET_SETTINGS)

        );

    }



    @Override
@@ -71,14 +81,4 @@ public class TextReadingPreferenceFragmentForSetupWizard extends TextReadingPref 
        // Hides help center in action bar and footer bar in SuW

        return 0;

    }



    /**

     * Updates the padding of the reset button to meet for SetupWizard style.

     */

    private void updateResetButtonPadding() {

        final LayoutPreference resetPreference = (LayoutPreference) findPreference(RESET_KEY);

        final ViewGroup parentView =

                (ViewGroup) resetPreference.findViewById(R.id.reset_button).getParent();

        LayoutStyler.applyPartnerCustomizationLayoutPaddingStyle(parentView);

    }

}

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

+7 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.settingslib.widget.LayoutPreference; 
 * The controller of the reset button in the text and reading options page.

 */

class TextReadingResetController extends BasePreferenceController {

    private boolean mIsVisible;

    private final View.OnClickListener mOnResetClickListener;



    @EntryPoint
@@ -65,6 +66,12 @@ class TextReadingResetController extends BasePreferenceController { 
                        AccessibilityStatsLogUtils.convertToEntryPoint(mEntryPoint));

            }

        });



        setVisible(screen, getPreferenceKey(), mIsVisible);

    }



    void setVisible(boolean isVisible) {

        mIsVisible = isVisible;

    }



    /**