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

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

Browse Source 
Bug: 146539308
Test: make RunSettingsRoboTests2
Change-Id: Ib3124aea307e42e648ba8d3f561dadb2901c06e5
This commit is contained in:
menghanli
2019-12-19 20:24:59 +08:00
committed by Menghan Li
parent 7b77b497d8
commit f74f3061e3
2 changed files with 3 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/accessibility/AccessibilityServiceWarning.java
View File

@@ -22,7 +22,6 @@ import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.Activity; import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.storage.StorageManager; import android.os.storage.StorageManager;
import android.text.BidiFormatter; import android.text.BidiFormatter;
@@ -77,22 +76,6 @@ public class AccessibilityServiceWarning {
return ad; return ad;
} }
public static Dialog createDisableDialog(Activity parentActivity,
AccessibilityServiceInfo info, DialogInterface.OnClickListener listener) {
final AlertDialog ad = new AlertDialog.Builder(parentActivity)
.setTitle(parentActivity.getString(R.string.disable_service_title,
info.getResolveInfo().loadLabel(parentActivity.getPackageManager())))
.setMessage(parentActivity.getString(R.string.disable_service_message,
parentActivity.getString(R.string.accessibility_dialog_button_stop),
getServiceName(parentActivity, info)))
.setCancelable(true)
.setPositiveButton(R.string.accessibility_dialog_button_stop, listener)
.setNegativeButton(R.string.accessibility_dialog_button_cancel, listener)
.create();
return ad;
}
/** /**
* Return whether the device is encrypted with legacy full disk encryption. Newer devices * Return whether the device is encrypted with legacy full disk encryption. Newer devices
* should be using File Based Encryption. * should be using File Based Encryption.

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

@@ -60,9 +60,8 @@ import java.util.List;
public class ToggleAccessibilityServicePreferenceFragment extends ToggleFeaturePreferenceFragment { public class ToggleAccessibilityServicePreferenceFragment extends ToggleFeaturePreferenceFragment {
private static final int DIALOG_ID_ENABLE_WARNING = 1; 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 = 2;
private static final int DIALOG_ID_LAUNCH_ACCESSIBILITY_TUTORIAL = 3; private static final int DIALOG_ID_EDIT_SHORTCUT = 3;
private static final int DIALOG_ID_EDIT_SHORTCUT = 4;
public static final int ACTIVITY_REQUEST_CONFIRM_CREDENTIAL_FOR_WEAKER_ENCRYPTION = 1; public static final int ACTIVITY_REQUEST_CONFIRM_CREDENTIAL_FOR_WEAKER_ENCRYPTION = 1;
@@ -121,20 +120,6 @@ public class ToggleAccessibilityServicePreferenceFragment extends ToggleFeatureP
mDialog.dismiss(); 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 @Override
public int getMetricsCategory() { public int getMetricsCategory() {
return SettingsEnums.ACCESSIBILITY_SERVICE; return SettingsEnums.ACCESSIBILITY_SERVICE;
@@ -210,15 +195,6 @@ public class ToggleAccessibilityServicePreferenceFragment extends ToggleFeatureP
.createCapabilitiesDialog(getActivity(), info, mViewOnClickListener); .createCapabilitiesDialog(getActivity(), info, mViewOnClickListener);
break; 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: { case DIALOG_ID_LAUNCH_ACCESSIBILITY_TUTORIAL: {
if (isGestureNavigateEnabled()) { if (isGestureNavigateEnabled()) {
mDialog = AccessibilityGestureNavigationTutorial mDialog = AccessibilityGestureNavigationTutorial
@@ -248,8 +224,6 @@ public class ToggleAccessibilityServicePreferenceFragment extends ToggleFeatureP
switch (dialogId) { switch (dialogId) {
case DIALOG_ID_ENABLE_WARNING: case DIALOG_ID_ENABLE_WARNING:
return SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_ENABLE; return SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_ENABLE;
case DIALOG_ID_DISABLE_WARNING:
return SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_DISABLE;
case DIALOG_ID_LAUNCH_ACCESSIBILITY_TUTORIAL: case DIALOG_ID_LAUNCH_ACCESSIBILITY_TUTORIAL:
return isGestureNavigateEnabled() return isGestureNavigateEnabled()
? SettingsEnums.DIALOG_TOGGLE_SCREEN_GESTURE_NAVIGATION ? SettingsEnums.DIALOG_TOGGLE_SCREEN_GESTURE_NAVIGATION
@@ -378,9 +352,7 @@ public class ToggleAccessibilityServicePreferenceFragment extends ToggleFeatureP
getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, false); getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, false);
showDialog(DIALOG_ID_ENABLE_WARNING); showDialog(DIALOG_ID_ENABLE_WARNING);
} else { } else {
mSwitchBar.setCheckedInternal(true); handleConfirmServiceEnabled(false);
getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, true);
showDialog(DIALOG_ID_DISABLE_WARNING);
} }
return true; return true;
} }