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
This commit is contained in:
Daniel Norman
2024-02-03 00:21:35 +00:00
parent c2d7daf645
commit 6c229865c9

View File

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