Merge "Revert "Replace ShortcutType with UserShortcutType to reduce dup..."" into main

This commit is contained in:
Daniel Norman
2024-02-05 02:56:49 +00:00
committed by Android (Google) Code Review

View File

@@ -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();
}