diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java index 603ff7a5ea2..b111faa6ec3 100644 --- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java @@ -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()); diff --git a/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java b/src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java similarity index 98% rename from src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java rename to src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java index 3bb03de9a9c..fd11ab00035 100644 --- a/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java +++ b/src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java @@ -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); diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java index a7fce6f2b02..b76e9a7e63c 100644 --- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java @@ -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); diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java index 0da55af85d8..630c24e3cae 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java @@ -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(); diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java index 9f76fad8d94..38597d12150 100644 --- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java +++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java @@ -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; diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorialTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutsTutorialTest.java similarity index 97% rename from tests/robotests/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorialTest.java rename to tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutsTutorialTest.java index 18a3c3abaac..a5aceed27b3 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorialTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutsTutorialTest.java @@ -16,10 +16,10 @@ package com.android.settings.accessibility; -import static com.android.settings.accessibility.AccessibilityGestureNavigationTutorial.createAccessibilityTutorialDialog; -import static com.android.settings.accessibility.AccessibilityGestureNavigationTutorial.createAccessibilityTutorialDialogForSetupWizard; -import static com.android.settings.accessibility.AccessibilityGestureNavigationTutorial.createShortcutTutorialPages; -import static com.android.settings.accessibility.AccessibilityGestureNavigationTutorial.showGestureNavigationTutorialDialog; +import static com.android.settings.accessibility.AccessibilityShortcutsTutorial.createAccessibilityTutorialDialog; +import static com.android.settings.accessibility.AccessibilityShortcutsTutorial.createAccessibilityTutorialDialogForSetupWizard; +import static com.android.settings.accessibility.AccessibilityShortcutsTutorial.createShortcutTutorialPages; +import static com.android.settings.accessibility.AccessibilityShortcutsTutorial.showGestureNavigationTutorialDialog; import static com.android.settings.accessibility.AccessibilityUtil.UserShortcutType; import static com.google.common.truth.Truth.assertThat; @@ -69,10 +69,10 @@ import org.robolectric.shadows.ShadowLooper; import java.util.Map; -/** Tests for {@link AccessibilityGestureNavigationTutorial}. */ +/** Tests for {@link AccessibilityShortcutsTutorial}. */ @Config(shadows = SettingsShadowResources.class) @RunWith(RobolectricTestRunner.class) -public final class AccessibilityGestureNavigationTutorialTest { +public final class AccessibilityShortcutsTutorialTest { private static final String FAKE_FEATURE_NAME = "Fake Feature Name"; @Rule