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

Merge "Remove all "Tapping Stop will stop x" dialog while turning off an accessibility service"

Browse Source
This commit is contained in:
Menghan Li
2019-12-25 01:29:00 +00:00
committed by Android (Google) Code Review
parent 38364aaa03 f74f3061e3
commit 3b87b777b0
2 changed files with 3 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
View File

@@ -62,9 +62,8 @@ public class ToggleAccessibilityServicePreferenceFragment extends
private static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";
private static final int DIALOG_ID_ENABLE_WARNING = 1;
private static final int DIALOG_ID_DISABLE_WARNING = 2;
private static final int DIALOG_ID_LAUNCH_ACCESSIBILITY_TUTORIAL = 3;
private static final int DIALOG_ID_EDIT_SHORTCUT = 4;
private static final int DIALOG_ID_LAUNCH_ACCESSIBILITY_TUTORIAL = 2;
private static final int DIALOG_ID_EDIT_SHORTCUT = 3;
public static final int ACTIVITY_REQUEST_CONFIRM_CREDENTIAL_FOR_WEAKER_ENCRYPTION = 1;
@@ -111,20 +110,6 @@ public class ToggleAccessibilityServicePreferenceFragment extends
mDialog.dismiss();
};
private final DialogInterface.OnClickListener mDialogInterfaceOnClickListener =
(DialogInterface dialog, int which) -> {
switch (which) {
case DialogInterface.BUTTON_POSITIVE:
handleConfirmServiceEnabled(false);
break;
case DialogInterface.BUTTON_NEGATIVE:
handleConfirmServiceEnabled(true);
break;
default:
throw new IllegalArgumentException();
}
};
@Override
public int getMetricsCategory() {
return SettingsEnums.ACCESSIBILITY_SERVICE;
@@ -200,15 +185,6 @@ public class ToggleAccessibilityServicePreferenceFragment extends
.createCapabilitiesDialog(getActivity(), info, mViewOnClickListener);
break;
}
case DIALOG_ID_DISABLE_WARNING: {
AccessibilityServiceInfo info = getAccessibilityServiceInfo();
if (info == null) {
return null;
}
mDialog = AccessibilityServiceWarning
.createDisableDialog(getActivity(), info, mDialogInterfaceOnClickListener);
break;
}
case DIALOG_ID_LAUNCH_ACCESSIBILITY_TUTORIAL: {
if (isGestureNavigateEnabled()) {
mDialog = AccessibilityGestureNavigationTutorial
@@ -238,8 +214,6 @@ public class ToggleAccessibilityServicePreferenceFragment extends
switch (dialogId) {
case DIALOG_ID_ENABLE_WARNING:
return SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_ENABLE;
case DIALOG_ID_DISABLE_WARNING:
return SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_DISABLE;
case DIALOG_ID_LAUNCH_ACCESSIBILITY_TUTORIAL:
return isGestureNavigateEnabled()
? SettingsEnums.DIALOG_TOGGLE_SCREEN_GESTURE_NAVIGATION
@@ -374,9 +348,7 @@ public class ToggleAccessibilityServicePreferenceFragment extends
getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, false);
showDialog(DIALOG_ID_ENABLE_WARNING);
} else {
mSwitchBar.setCheckedInternal(true);
getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, true);
showDialog(DIALOG_ID_DISABLE_WARNING);
handleConfirmServiceEnabled(false);
}
return true;
}