From c63d68d3d476cc3b8ba9cf577e1e974e782a2e92 Mon Sep 17 00:00:00 2001 From: Fabian Kozynski Date: Mon, 30 Nov 2020 12:28:12 -0500 Subject: Do not close QS on security footer dialog Show the dialog on top of QS. Make sure that QS is dismissed if dialog launches another activity. Test: manual Fixes: 174038860 Change-Id: I86ce7fd1a6c7a411f53c024bc26e71b822911573 --- packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java index 478923994af8..a57062c3547f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java @@ -140,8 +140,6 @@ class QSSecurityFooter implements OnClickListener, DialogInterface.OnClickListen } public void showDeviceMonitoringDialog() { - mHost.collapsePanels(); - // TODO: Delay dialog creation until after panels are collapsed. createDialog(); } @@ -276,6 +274,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); } } @@ -581,6 +580,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); } -- cgit v1.2.3-59-g8ed1b