summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java4
1 files 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);
}