Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not close QS on security footer dialog"

Browse Source
This commit is contained in:
Fabian Kozynski
2020-12-08 20:33:43 +00:00
committed by Android (Google) Code Review
parent 8e3ec4343d c63d68d3d4
commit 2e81da64f7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java
View File

@@ -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);
}