Merge "Do not close QS on security footer dialog" (2e81da64) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -143,8 +143,6 @@ class QSSecurityFooter implements OnClickListener, DialogInterface.OnClickListen
		}

		public void showDeviceMonitoringDialog() {
		mHost.collapsePanels();
		// TODO: Delay dialog creation until after panels are collapsed.
		createDialog();
		}

		@@ -291,6 +289,7 @@ class QSSecurityFooter implements OnClickListener, DialogInterface.OnClickListen
		if (which == DialogInterface.BUTTON_NEGATIVE) {
		final Intent intent = new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS);
		mDialog.dismiss();
		// This dismisses the shade on opening the activity
		mActivityStarter.postStartActivityDismissingKeyguard(intent, 0);
		}
		}
		@@ -605,6 +604,7 @@ class QSSecurityFooter implements OnClickListener, DialogInterface.OnClickListen
		public void onClick(View widget) {
		final Intent intent = new Intent(Settings.ACTION_VPN_SETTINGS);
		mDialog.dismiss();
		// This dismisses the shade on opening the activity
		mActivityStarter.postStartActivityDismissingKeyguard(intent, 0);
		}