Hide enable dialog and prefix pref wrongly enabled am: e513c71189
am: 335c87b924
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23114516 Change-Id: I19ab97192df79f83be2178117dae042260236c34 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -528,16 +528,24 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
|
||||
boolean isChecked = pref.isChecked();
|
||||
|
||||
if (isChecked) {
|
||||
// Since we are enabling it we should confirm the user decision with a
|
||||
// dialog box.
|
||||
NewProviderConfirmationDialogFragment fragment =
|
||||
newNewProviderConfirmationDialogFragment(
|
||||
packageName, title, /* setActivityResult= */ false);
|
||||
if (fragment == null || mFragmentManager == null) {
|
||||
return true;
|
||||
}
|
||||
if (togglePackageNameEnabled(packageName)) {
|
||||
// Enable all prefs.
|
||||
if (mPrefs.containsKey(packageName)) {
|
||||
mPrefs.get(packageName).setChecked(true);
|
||||
}
|
||||
} else {
|
||||
// Since we failed to show toggle the switch back to off.
|
||||
pref.setChecked(false);
|
||||
|
||||
fragment.show(mFragmentManager, NewProviderConfirmationDialogFragment.TAG);
|
||||
// Show the error if too many enabled.
|
||||
final DialogFragment fragment = newErrorDialogFragment();
|
||||
|
||||
if (fragment == null || mFragmentManager == null) {
|
||||
return true;
|
||||
}
|
||||
|
||||
fragment.show(mFragmentManager, ErrorDialogFragment.TAG);
|
||||
}
|
||||
|
||||
return true;
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user