Warn earlier about 5 provider limit
Test: ondevice Bug: 281616441 Change-Id: I4c4d257e1a0a6396b3948a2b50462bbef1987729
This commit is contained in:
@@ -533,16 +533,9 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
|
||||
boolean isChecked = pref.isChecked();
|
||||
|
||||
if (isChecked) {
|
||||
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);
|
||||
|
||||
if (mEnabledPackageNames.size() >= MAX_SELECTABLE_PROVIDERS) {
|
||||
// Show the error if too many enabled.
|
||||
pref.setChecked(false);
|
||||
final DialogFragment fragment = newErrorDialogFragment();
|
||||
|
||||
if (fragment == null || mFragmentManager == null) {
|
||||
@@ -550,8 +543,15 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
|
||||
}
|
||||
|
||||
fragment.show(mFragmentManager, ErrorDialogFragment.TAG);
|
||||
return true;
|
||||
}
|
||||
|
||||
togglePackageNameEnabled(packageName);
|
||||
|
||||
// Enable all prefs.
|
||||
if (mPrefs.containsKey(packageName)) {
|
||||
mPrefs.get(packageName).setChecked(true);
|
||||
}
|
||||
return true;
|
||||
} else {
|
||||
// If we are disabling the last enabled provider then show a warning.
|
||||
|
Reference in New Issue
Block a user