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

Commit 4c9d268f authored by Chun-Ku Lin's avatar Chun-Ku Lin
Browse files

Rename AccessibilityGestureNavigationTutorial to AccessibilityShortcutsTutorial 

AccessibilityGestureNavigationTutorial is not only for displaying
tutorial for accessibility gesture shortcut. It's used for display the
tutorials for all the selected accessibility shortcuts. Renamed the
class to match it's responsibility.

Bug: N/A
Flag: EXEMPT Strict mechanical refactors
Test: build succeed locally

Change-Id: I1dd212abc660454e77f18f770c2ecc17be320eaa
parent 257ac132

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

+2 −2
Original line number Diff line number Diff line
@@ -220,12 +220,12 @@ public abstract class AccessibilityShortcutPreferenceFragment extends Restricted 
                return mDialog;

            case DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL:

                if (WizardManagerHelper.isAnySetupWizard(getIntent())) {

                    mDialog = AccessibilityGestureNavigationTutorial

                    mDialog = AccessibilityShortcutsTutorial

                            .createAccessibilityTutorialDialogForSetupWizard(

                                    getPrefContext(), getUserShortcutTypes(),

                                    this::callOnTutorialDialogButtonClicked, getLabelName());

                } else {

                    mDialog = AccessibilityGestureNavigationTutorial

                    mDialog = AccessibilityShortcutsTutorial

                            .createAccessibilityTutorialDialog(

                                    getPrefContext(), getUserShortcutTypes(),

                                    this::callOnTutorialDialogButtonClicked, getLabelName());

src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java→src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java

+10 −10
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License

 * limitations under the License.

 */



package com.android.settings.accessibility;
@@ -72,10 +72,10 @@ import java.util.List; 
import java.util.Map;



/**

 * Utility class for creating the dialog that guides users for gesture navigation for

 * accessibility services.

 * Utility class for creating the dialog that shows tutorials on how to use the selected

 * accessibility shortcut types

 */

public final class AccessibilityGestureNavigationTutorial {

public final class AccessibilityShortcutsTutorial {

    private static final String TAG = "AccessibilityGestureNavigationTutorial";



    /** IntDef enum for dialog type. */
@@ -92,9 +92,9 @@ public final class AccessibilityGestureNavigationTutorial { 
        int GESTURE_NAVIGATION_SETTINGS = 2;

    }



    private AccessibilityGestureNavigationTutorial() {}

    private AccessibilityShortcutsTutorial() {}



    private static final DialogInterface.OnClickListener mOnClickListener =

    private static final DialogInterface.OnClickListener ON_CLICK_LISTENER =

            (DialogInterface dialog, int which) -> dialog.dismiss();



    /**
@@ -106,7 +106,7 @@ public final class AccessibilityGestureNavigationTutorial { 
        final AlertDialog alertDialog = new AlertDialog.Builder(context)

                .setView(createTutorialDialogContentView(context,

                        DialogType.GESTURE_NAVIGATION_SETTINGS))

                .setPositiveButton(R.string.accessibility_tutorial_dialog_button, mOnClickListener)

                .setPositiveButton(R.string.accessibility_tutorial_dialog_button, ON_CLICK_LISTENER)

                .setOnDismissListener(onDismissListener)

                .create();
@@ -124,7 +124,7 @@ public final class AccessibilityGestureNavigationTutorial { 
    static AlertDialog createAccessibilityTutorialDialog(

            @NonNull Context context, int shortcutTypes, @NonNull CharSequence featureName) {

        return createAccessibilityTutorialDialog(

                context, shortcutTypes, mOnClickListener, featureName);

                context, shortcutTypes, ON_CLICK_LISTENER, featureName);

    }



    static AlertDialog createAccessibilityTutorialDialog(
@@ -184,7 +184,7 @@ public final class AccessibilityGestureNavigationTutorial { 
    static AlertDialog createAccessibilityTutorialDialogForSetupWizard(Context context,

            int shortcutTypes, CharSequence featureName) {

        return createAccessibilityTutorialDialogForSetupWizard(context, shortcutTypes,

                mOnClickListener, featureName);

                ON_CLICK_LISTENER, featureName);

    }



    static AlertDialog createAccessibilityTutorialDialogForSetupWizard(
@@ -259,7 +259,7 @@ public final class AccessibilityGestureNavigationTutorial { 
    private static AlertDialog createDialog(Context context, int dialogType) {

        final AlertDialog alertDialog = new AlertDialog.Builder(context)

                .setView(createTutorialDialogContentView(context, dialogType))

                .setPositiveButton(R.string.accessibility_tutorial_dialog_button, mOnClickListener)

                .setPositiveButton(R.string.accessibility_tutorial_dialog_button, ON_CLICK_LISTENER)

                .create();



        alertDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);

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

+2 −2
Original line number Diff line number Diff line
@@ -225,12 +225,12 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment 
                return mDialog;

            case DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL:

                if (isAnySetupWizard()) {

                    mDialog = AccessibilityGestureNavigationTutorial

                    mDialog = AccessibilityShortcutsTutorial

                            .createAccessibilityTutorialDialogForSetupWizard(

                                    getPrefContext(), getUserShortcutTypes(),

                                    this::callOnTutorialDialogButtonClicked, mPackageName);

                } else {

                    mDialog = AccessibilityGestureNavigationTutorial

                    mDialog = AccessibilityShortcutsTutorial

                            .createAccessibilityTutorialDialog(

                                    getPrefContext(), getUserShortcutTypes(),

                                    this::callOnTutorialDialogButtonClicked, mPackageName);

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

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends 
        }

        switch (dialogId) {

            case DialogEnums.GESTURE_NAVIGATION_TUTORIAL:

                return AccessibilityGestureNavigationTutorial

                return AccessibilityShortcutsTutorial

                        .showAccessibilityGestureTutorialDialog(getPrefContext());

            case DialogEnums.MAGNIFICATION_EDIT_SHORTCUT:

                final CharSequence dialogTitle = getShortcutTitle();

src/com/android/settings/gestures/SystemNavigationGestureSettings.java

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ import androidx.annotation.VisibleForTesting; 
import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.accessibility.AccessibilityGestureNavigationTutorial;

import com.android.settings.accessibility.AccessibilityShortcutsTutorial;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.core.PreferenceControllerListHelper;

import com.android.settings.core.SubSettingLauncher;
@@ -101,7 +101,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i 
            mA11yTutorialDialogShown =

                    savedInstanceState.getBoolean(KEY_SHOW_A11Y_TUTORIAL_DIALOG, false);

            if (mA11yTutorialDialogShown) {

                AccessibilityGestureNavigationTutorial.showGestureNavigationTutorialDialog(

                AccessibilityShortcutsTutorial.showGestureNavigationTutorialDialog(

                        getContext(), dialog -> mA11yTutorialDialogShown = false);

            }

        }
@@ -355,7 +355,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i 
                && !isAccessibilityFloatingMenuEnabled()

                && (isAnyServiceSupportAccessibilityButton() || isNavBarMagnificationEnabled())) {

            mA11yTutorialDialogShown = true;

            AccessibilityGestureNavigationTutorial.showGestureNavigationTutorialDialog(getContext(),

            AccessibilityShortcutsTutorial.showGestureNavigationTutorialDialog(getContext(),

                    dialog -> mA11yTutorialDialogShown = false);

        } else {

            mA11yTutorialDialogShown = false;