From 6c229865c9c2d1306fb8f5a712ec4be56d99f5bd Mon Sep 17 00:00:00 2001
From: Daniel Norman <danielnorman@google.com>
Date: Sat, 3 Feb 2024 00:21:35 +0000
Subject: [PATCH] Revert "Replace ShortcutType with UserShortcutType to reduce
 dup..."

Revert submission 25959129-chunkulin-replace-shortcutTypeConstant

Reason for revert: Reverting refactoring, to land after 24Q2 branches off of main. See b/323463488

Reverted changes: /q/submissionid:25959129-chunkulin-replace-shortcutTypeConstant

Change-Id: I323637727f4b642b3a6c626eae62bdaf0032eaf2
---
 .../settings/gestures/SystemNavigationGestureSettings.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
index c6b1bdb6ada..c40212b7e01 100644
--- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
+++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
@@ -41,7 +41,6 @@ import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceScreen;
 
-import com.android.internal.accessibility.common.ShortcutConstants;
 import com.android.settings.R;
 import com.android.settings.accessibility.AccessibilityGestureNavigationTutorial;
 import com.android.settings.core.SubSettingLauncher;
@@ -354,7 +353,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
     private boolean isAnyServiceSupportAccessibilityButton() {
         final AccessibilityManager ams = getContext().getSystemService(AccessibilityManager.class);
         final List<String> targets = ams.getAccessibilityShortcutTargets(
-                ShortcutConstants.UserShortcutType.SOFTWARE);
+                AccessibilityManager.ACCESSIBILITY_BUTTON);
         return !targets.isEmpty();
     }