From c2d7daf645ff49d6ec19f029ad7179817677d9e9 Mon Sep 17 00:00:00 2001 From: Chun-Ku Lin Date: Sat, 20 Jan 2024 05:40:52 +0000 Subject: [PATCH] Replace ShortcutType with UserShortcutType to reduce duplicate declaration. Bug: 317424693 Test: atest Flag: N/A. Not able to flag the refactor Change-Id: I20aea442cb08f047f98422176058acf4b344d2f1 --- .../settings/gestures/SystemNavigationGestureSettings.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java index c40212b7e01..c6b1bdb6ada 100644 --- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java +++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java @@ -41,6 +41,7 @@ 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; @@ -353,7 +354,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i private boolean isAnyServiceSupportAccessibilityButton() { final AccessibilityManager ams = getContext().getSystemService(AccessibilityManager.class); final List targets = ams.getAccessibilityShortcutTargets( - AccessibilityManager.ACCESSIBILITY_BUTTON); + ShortcutConstants.UserShortcutType.SOFTWARE); return !targets.isEmpty(); }