Merge "Dismiss keyguard for brightness QS tile." into jb-mr1-dev

Author: dsandler

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java

@@ -767,6 +767,10 @@ public void onDismiss(DialogInterface dialog) {
             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 @@ public void onClick(DialogInterface dialog, int which) {
         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();
     }