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

Hide enable dialog and prefix pref wrongly enabled am: e513c71189 am: 335c87b924

Browse Source 
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:
Becca Hughes
2023-05-09 22:59:42 +00:00
committed by Automerger Merge Worker
parent 422b397988 335c87b924
commit 249713a244
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -528,16 +528,24 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
boolean isChecked = pref.isChecked(); boolean isChecked = pref.isChecked();
if (isChecked) { if (isChecked) {
// Since we are enabling it we should confirm the user decision with a if (togglePackageNameEnabled(packageName)) {
// dialog box. // Enable all prefs.
NewProviderConfirmationDialogFragment fragment = if (mPrefs.containsKey(packageName)) {
newNewProviderConfirmationDialogFragment( mPrefs.get(packageName).setChecked(true);
packageName, title, /* setActivityResult= */ false); }
if (fragment == null || mFragmentManager == null) { } else {
return true; // 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; return true;
} else { } else {