Merge "Replace ShortcutType with UserShortcutType to reduce duplicate declaration." into main
This commit is contained in:
@@ -41,6 +41,7 @@ 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;
|
||||||
@@ -353,7 +354,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(
|
||||||
AccessibilityManager.ACCESSIBILITY_BUTTON);
|
ShortcutConstants.UserShortcutType.SOFTWARE);
|
||||||
return !targets.isEmpty();
|
return !targets.isEmpty();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user