summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Daniel Sandler <dsandler@android.com> 2012-10-09 00:37:53 -0400
committer Daniel Sandler <dsandler@android.com> 2012-10-09 00:37:53 -0400
commitb64c3dd22410cd829a9f03ce935a598f79224f10 (patch)
tree4c6a208c6815d6a5c08453733c054f02f6f62043
parentde8e3b122bbbd61aa35fd5cd4fe2fc86cd6f0040 (diff)
Dismiss keyguard for brightness QS tile.
Bugreport, too. Bug: 7296769 Change-Id: I28b2f1cf4a1bf2ebfcff37a6188f33a44b7d2165
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
index 2e298d1b5ab4..266b88f90794 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
@@ -732,6 +732,10 @@ class QuickSettings {
mBrightnessDialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
}
if (!mBrightnessDialog.isShowing()) {
+ try {
+ WindowManagerGlobal.getWindowManagerService().dismissKeyguard();
+ } catch (RemoteException e) {
+ }
mBrightnessDialog.show();
dismissBrightnessDialog(mBrightnessDialogLongTimeout);
}
@@ -770,6 +774,10 @@ class QuickSettings {
builder.setCancelable(true);
final Dialog dialog = builder.create();
dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
+ try {
+ WindowManagerGlobal.getWindowManagerService().dismissKeyguard();
+ } catch (RemoteException e) {
+ }
dialog.show();
}