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

Hide dialog when disabling Credential Manager providers

Browse Source 
In the CredMan settings page we have a dialog that asks
the user to confirm their action. It has been decided
by UX/product that this should be removed.

Test: make
Bug: 267816757
Change-Id: I61528e5ac5300cd1d7165bf0eadee794b28aa02d
This commit is contained in:
Becca Hughes
2023-02-08 18:33:51 +00:00
parent 6bbe735831
commit cd453fb58c
1 changed files with 2 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java
View File

@@ -293,15 +293,8 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
return true; return true;
} else { } else {
// Show the confirm disable dialog. // Disable the provider.
final DialogFragment fragment = togglePackageNameDisabled(packageName);
newConfirmationDialogFragment(packageName, title, pref);
if (fragment == null || mFragmentManager == null) {
return true;
}
fragment.show(mFragmentManager, ConfirmationDialogFragment.TAG);
} }
return true; return true;
@@ -334,29 +327,6 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
}); });
} }
private @Nullable ConfirmationDialogFragment newConfirmationDialogFragment(
@NonNull String packageName,
@NonNull CharSequence appName,
@NonNull SwitchPreference pref) {
DialogHost host =
new DialogHost() {
@Override
public void onDialogClick(int whichButton) {
if (whichButton == DialogInterface.BUTTON_POSITIVE) {
// Since the package is now enabled then we
// should remove it from the enabled list.
togglePackageNameDisabled(packageName);
} else if (whichButton == DialogInterface.BUTTON_NEGATIVE) {
// Set the checked back to true because we
// backed out of turning this off.
pref.setChecked(true);
}
}
};
return new ConfirmationDialogFragment(host, packageName, appName);
}
private @Nullable ErrorDialogFragment newErrorDialogFragment() { private @Nullable ErrorDialogFragment newErrorDialogFragment() {
DialogHost host = DialogHost host =
new DialogHost() { new DialogHost() {
@@ -416,44 +386,4 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
@Override @Override
public void onClick(DialogInterface dialog, int which) {} public void onClick(DialogInterface dialog, int which) {}
} }
/**
* Confirmation dialog fragment shows a dialog to the user to confirm that they are disabling a
* provider.
*/
public static class ConfirmationDialogFragment extends CredentialManagerDialogFragment {
ConfirmationDialogFragment(
DialogHost dialogHost, @NonNull String packageName, @NonNull CharSequence appName) {
super(dialogHost);
final Bundle argument = new Bundle();
argument.putString(PACKAGE_NAME_KEY, packageName);
argument.putCharSequence(APP_NAME_KEY, appName);
setArguments(argument);
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
final Bundle bundle = getArguments();
final String title =
getContext()
.getString(
R.string.credman_confirmation_message_title,
bundle.getCharSequence(
CredentialManagerDialogFragment.APP_NAME_KEY));
return new AlertDialog.Builder(getActivity())
.setTitle(title)
.setMessage(getContext().getString(R.string.credman_confirmation_message))
.setPositiveButton(R.string.credman_confirmation_message_positive_button, this)
.setNegativeButton(android.R.string.cancel, this)
.create();
}
@Override
public void onClick(DialogInterface dialog, int which) {
getDialogHost().onDialogClick(which);
}
}
} }