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

Commit 0a9d2385 authored by Menghan Li's avatar Menghan Li Committed by Android (Google) Code Review
Browse files

Merge "Move DialogEumn into AccessibilityDialogUtils" into sc-dev

parents 0a8ab3a5 78c093b0

src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java→src/com/android/settings/accessibility/AccessibilityDialogUtils.java

+52 −2
Original line number Diff line number Diff line
@@ -62,7 +62,57 @@ import java.util.List; 
/**

 * Utility class for creating the edit dialog.

 */

public class AccessibilityEditDialogUtils {

public class AccessibilityDialogUtils {



    /** Denotes the dialog emuns for show dialog. */

    @Retention(RetentionPolicy.SOURCE)

    public @interface DialogEnums {



        /** OPEN: Settings > Accessibility > Any toggle service > Shortcut > Settings. */

        int EDIT_SHORTCUT = 1;



        /** OPEN: Settings > Accessibility > Magnification > Shortcut > Settings. */

        int MAGNIFICATION_EDIT_SHORTCUT = 1001;



        /**

         * OPEN: Settings > Accessibility > Downloaded toggle service > Toggle use service to

         * enable service.

         */

        int ENABLE_WARNING_FROM_TOGGLE = 1002;



        /** OPEN: Settings > Accessibility > Downloaded toggle service > Shortcut checkbox. */

        int ENABLE_WARNING_FROM_SHORTCUT = 1003;



        /**

         * OPEN: Settings > Accessibility > Downloaded toggle service > Shortcut checkbox

         * toggle.

         */

        int ENABLE_WARNING_FROM_SHORTCUT_TOGGLE = 1004;



        /**

         * OPEN: Settings > Accessibility > Downloaded toggle service > Toggle use service to

         * disable service.

         */

        int DISABLE_WARNING_FROM_TOGGLE = 1005;



        /**

         * OPEN: Settings > Accessibility > Magnification > Toggle user service in button

         * navigation.

         */

        int ACCESSIBILITY_BUTTON_TUTORIAL = 1006;



        /**

         * OPEN: Settings > Accessibility > Magnification > Toggle user service in gesture

         * navigation.

         */

        int GESTURE_NAVIGATION_TUTORIAL = 1007;



        /**

         * OPEN: Settings > Accessibility > Downloaded toggle service > Toggle user service > Show

         * launch tutorial.

         */

        int LAUNCH_ACCESSIBILITY_TUTORIAL = 1008;

    }



    /**

     * IntDef enum for dialog type that indicates different dialog for user to choose the shortcut

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

+4 −4
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.settings.accessibility;



import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_CONTROLLER_NAME;

import static com.android.settings.accessibility.AccessibilityEditDialogUtils.CustomButton;

import static com.android.settings.accessibility.AccessibilityDialogUtils.CustomButton;

import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;

import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
@@ -166,7 +166,7 @@ public class MagnificationModePreferenceController extends BasePreferenceControl 
    }



    private Dialog createMagnificationModeDialog() {

        mMagnificationModesListView = AccessibilityEditDialogUtils.createSingleChoiceListView(

        mMagnificationModesListView = AccessibilityDialogUtils.createSingleChoiceListView(

                mContext, mModeInfos, this::onMagnificationModeSelected);



        final View headerView = LayoutInflater.from(mContext).inflate(
@@ -179,7 +179,7 @@ public class MagnificationModePreferenceController extends BasePreferenceControl 
        final CharSequence title = mContext.getString(

                R.string.accessibility_magnification_mode_dialog_title);



        return AccessibilityEditDialogUtils.createCustomDialog(mContext, title,

        return AccessibilityDialogUtils.createCustomDialog(mContext, title,

                mMagnificationModesListView, this::onMagnificationModeDialogPositiveButtonClicked);

    }
@@ -235,7 +235,7 @@ public class MagnificationModePreferenceController extends BasePreferenceControl 
    }



    private Dialog createMagnificationShortCutConfirmDialog() {

        return AccessibilityEditDialogUtils.createMagnificationSwitchShortcutDialog(mContext,

        return AccessibilityDialogUtils.createMagnificationSwitchShortcutDialog(mContext,

                this::onSwitchShortcutDialogButtonClicked);

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settings.accessibility;



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

import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logAccessibilityServiceEnabled;

import static com.android.settings.accessibility.PreferredShortcuts.retrieveUserShortcutType;

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

+4 −54
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settings.accessibility;



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



import android.app.Dialog;

import android.app.settings.SettingsEnums;

import android.content.ComponentName;
@@ -50,7 +52,7 @@ import androidx.preference.PreferenceScreen; 
import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.accessibility.AccessibilityEditDialogUtils.DialogType;

import com.android.settings.accessibility.AccessibilityDialogUtils.DialogType;

import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;

import com.android.settings.utils.LocaleUtils;

import com.android.settings.widget.SettingsMainSwitchBar;
@@ -61,8 +63,6 @@ import com.android.settingslib.widget.OnMainSwitchChangeListener; 


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



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.List;

import java.util.Locale;
@@ -228,7 +228,7 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 
                        R.string.accessibility_shortcut_title, mPackageName);

                final int dialogType = WizardManagerHelper.isAnySetupWizard(getIntent())

                        ? DialogType.EDIT_SHORTCUT_GENERIC_SUW : DialogType.EDIT_SHORTCUT_GENERIC;

                dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(

                dialog = AccessibilityDialogUtils.showEditShortcutDialog(

                        getPrefContext(), dialogType, dialogTitle,

                        this::callOnAlertDialogCheckboxClicked);

                setupEditShortcutDialog(dialog);
@@ -256,56 +256,6 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 
        }

    }



    /** Denotes the dialog emuns for show dialog */

    @Retention(RetentionPolicy.SOURCE)

    protected @interface DialogEnums {



        /** OPEN: Settings > Accessibility > Any toggle service > Shortcut > Settings. */

        int EDIT_SHORTCUT = 1;



        /** OPEN: Settings > Accessibility > Magnification > Shortcut > Settings. */

        int MAGNIFICATION_EDIT_SHORTCUT = 1001;



        /**

         * OPEN: Settings > Accessibility > Downloaded toggle service > Toggle use service to

         * enable service.

         */

        int ENABLE_WARNING_FROM_TOGGLE = 1002;



        /** OPEN: Settings > Accessibility > Downloaded toggle service > Shortcut checkbox. */

        int ENABLE_WARNING_FROM_SHORTCUT = 1003;



        /**

         * OPEN: Settings > Accessibility > Downloaded toggle service > Shortcut checkbox

         * toggle.

         */

        int ENABLE_WARNING_FROM_SHORTCUT_TOGGLE = 1004;



        /**

         * OPEN: Settings > Accessibility > Downloaded toggle service > Toggle use service to

         * disable service.

         */

        int DISABLE_WARNING_FROM_TOGGLE = 1005;



        /**

         * OPEN: Settings > Accessibility > Magnification > Toggle user service in button

         * navigation.

         */

        int ACCESSIBILITY_BUTTON_TUTORIAL = 1006;



        /**

         * OPEN: Settings > Accessibility > Magnification > Toggle user service in gesture

         * navigation.

         */

        int GESTURE_NAVIGATION_TUTORIAL = 1007;



        /**

         * OPEN: Settings > Accessibility > Downloaded toggle service > Toggle user service > Show

         * launch tutorial.

         */

        int LAUNCH_ACCESSIBILITY_TUTORIAL = 1008;

    }



    @Override

    public int getMetricsCategory() {

        return SettingsEnums.ACCESSIBILITY_SERVICE;

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

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.accessibility;



import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_CONTROLLER_NAME;

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

import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;

import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
@@ -44,7 +45,7 @@ import androidx.preference.PreferenceCategory; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.DialogCreatable;

import com.android.settings.R;

import com.android.settings.accessibility.AccessibilityEditDialogUtils.DialogType;

import com.android.settings.accessibility.AccessibilityDialogUtils.DialogType;

import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;

import com.android.settings.utils.LocaleUtils;
@@ -134,7 +135,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends 
                final int dialogType = WizardManagerHelper.isAnySetupWizard(getIntent())

                        ? DialogType.EDIT_SHORTCUT_MAGNIFICATION_SUW

                        : DialogType.EDIT_SHORTCUT_MAGNIFICATION;

                dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(getPrefContext(),

                dialog = AccessibilityDialogUtils.showEditShortcutDialog(getPrefContext(),

                        dialogType, dialogTitle, this::callOnAlertDialogCheckboxClicked);

                setupMagnificationEditShortcutDialog(dialog);

                return dialog;