Merge "If you tap outside dialog then re-enable" into udc-dev (90b344e7) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -620,6 +620,9 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
		completeEnableProviderDialogBox(
		whichButton, packageName, setActivityResult);
		}

		@Override
		public void onCancel() {}
		};

		return new NewProviderConfirmationDialogFragment(host, packageName, appName);
		@@ -666,6 +669,9 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
		new DialogHost() {
		@Override
		public void onDialogClick(int whichButton) {}

		@Override
		public void onCancel() {}
		};

		return new ErrorDialogFragment(host);
		@@ -689,6 +695,12 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
		pref.setChecked(true);
		}
		}

		@Override
		public void onCancel() {
		// If we dismiss the dialog then re-enable.
		pref.setChecked(true);
		}
		};

		return new ConfirmationDialogFragment(host, packageName, appName);
		@@ -705,6 +717,8 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
		/** Called when the dialog button is clicked. */
		private static interface DialogHost {
		void onDialogClick(int whichButton);

		void onCancel();
		}

		/** Called to send messages back to the parent fragment. */
		@@ -754,6 +768,11 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
		public DialogHost getDialogHost() {
		return mDialogHost;
		}

		@Override
		public void onCancel(@NonNull DialogInterface dialog) {
		getDialogHost().onCancel();
		}
		}

		/** Dialog showing error when too many providers are selected. */