diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-10-10 22:44:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-10 22:44:48 -0700 |
| commit | 6c179ad82d45a33389e65d89305ed0919042674f (patch) | |
| tree | edeb97e44e640359e9a0bc41c14762dcc3c7d442 /packages | |
| parent | 31cee479fc43fc422b481f6360fa499a7b4fc70a (diff) | |
| parent | b64c3dd22410cd829a9f03ce935a598f79224f10 (diff) | |
| download | frameworks_base-6c179ad82d45a33389e65d89305ed0919042674f.zip frameworks_base-6c179ad82d45a33389e65d89305ed0919042674f.tar.gz frameworks_base-6c179ad82d45a33389e65d89305ed0919042674f.tar.bz2 | |
Merge "Dismiss keyguard for brightness QS tile." into jb-mr1-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java | 8 |
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 0937c46..32af5e3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java @@ -767,6 +767,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); } @@ -805,6 +809,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(); } |