Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable the Accessibility Shortcut dialog on TV."

Browse Source
This commit is contained in:
Thomas Leu
2022-12-08 07:32:47 +00:00
committed by Android (Google) Code Review
parent feb3245d79 60efddb3e9
commit f5887cba0a
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/com/android/internal/accessibility/AccessibilityShortcutController.java
View File

@@ -226,9 +226,7 @@ public class AccessibilityShortcutController {
Slog.d(TAG, "Accessibility shortcut activated");
final ContentResolver cr = mContext.getContentResolver();
final int userId = ActivityManager.getCurrentUser();
final int dialogAlreadyShown = Settings.Secure.getIntForUser(
cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, DialogStatus.NOT_SHOWN,
userId);
// Play a notification vibration
Vibrator vibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE);
if ((vibrator != null) && vibrator.hasVibrator()) {
@@ -239,7 +237,7 @@ public class AccessibilityShortcutController {
vibrator.vibrate(vibePattern, -1, VIBRATION_ATTRIBUTES);
}
if (dialogAlreadyShown == DialogStatus.NOT_SHOWN) {
if (shouldShowDialog()) {
// The first time, we show a warning rather than toggle the service to give the user a
// chance to turn off this feature before stuff gets enabled.
mAlertDialog = createShortcutWarningDialog(userId);
@@ -269,6 +267,20 @@ public class AccessibilityShortcutController {
}
}
/** Whether the warning dialog should be shown instead of performing the shortcut. */
private boolean shouldShowDialog() {
if (hasFeatureLeanback()) {
// Never show the dialog on TV, instead always perform the shortcut directly.
return false;
}
final ContentResolver cr = mContext.getContentResolver();
final int userId = ActivityManager.getCurrentUser();
final int dialogAlreadyShown = Settings.Secure.getIntForUser(cr,
Settings.Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, DialogStatus.NOT_SHOWN,
userId);
return dialogAlreadyShown == DialogStatus.NOT_SHOWN;
}
/**
* Show toast to alert the user that the accessibility shortcut turned on or off an
* accessibility service.