PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add the enabled status into the condition for the service which is VolumeShortcutToggle type." into rvc-dev

Browse Source
This commit is contained in:
PETER LIANG
2020-04-27 07:20:16 +00:00
committed by Android (Google) Code Review
parent 3becd37d47 9e50eb1598
commit c0fc0e4542
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/accessibility/LegacyAccessibilityServicePreferenceFragment.java
View File

@@ -52,11 +52,12 @@ public class LegacyAccessibilityServicePreferenceFragment extends
@Override @Override
int getUserShortcutTypes() { int getUserShortcutTypes() {
int shortcutTypes = super.getUserShortcutTypes(); int shortcutTypes = super.getUserShortcutTypes();
final boolean isServiceOn =
getArguments().getBoolean(AccessibilitySettings.EXTRA_CHECKED);
final AccessibilityServiceInfo info = getAccessibilityServiceInfo(); final AccessibilityServiceInfo info = getAccessibilityServiceInfo();
final boolean hasRequestAccessibilityButtonFlag = final boolean hasRequestAccessibilityButtonFlag =
(info.flags & AccessibilityServiceInfo.FLAG_REQUEST_ACCESSIBILITY_BUTTON) != 0; (info.flags & AccessibilityServiceInfo.FLAG_REQUEST_ACCESSIBILITY_BUTTON) != 0;
if (hasRequestAccessibilityButtonFlag) { if (hasRequestAccessibilityButtonFlag && isServiceOn) {
shortcutTypes |= UserShortcutType.SOFTWARE; shortcutTypes |= UserShortcutType.SOFTWARE;
} else { } else {
shortcutTypes &= (~UserShortcutType.SOFTWARE); shortcutTypes &= (~UserShortcutType.SOFTWARE);