Merge "Revert "Replace ShortcutType with UserShortcutType to reduce dup..."" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
4ed106c909
@@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user