Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b68b0958 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 0f60eddf: am 5f9cd5e6: am 6c179ad8: Merge "Dismiss keyguard for brightness... 

am 0f60eddf: am 5f9cd5e6: am 6c179ad8: Merge "Dismiss keyguard for brightness QS tile." into jb-mr1-dev

* commit '0f60eddf':
  Dismiss keyguard for brightness QS tile.
parents efce935e 0f60eddf

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -767,6 +767,10 @@ class QuickSettings { 
            mBrightnessDialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);

            mBrightnessDialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);

        }

        }

        if (!mBrightnessDialog.isShowing()) {

        if (!mBrightnessDialog.isShowing()) {

            try {

                WindowManagerGlobal.getWindowManagerService().dismissKeyguard();

            } catch (RemoteException e) {

            }

            mBrightnessDialog.show();

            mBrightnessDialog.show();

            dismissBrightnessDialog(mBrightnessDialogLongTimeout);

            dismissBrightnessDialog(mBrightnessDialogLongTimeout);

        }

        }
@@ -805,6 +809,10 @@ class QuickSettings { 
        builder.setCancelable(true);

        builder.setCancelable(true);

        final Dialog dialog = builder.create();

        final Dialog dialog = builder.create();

        dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);

        dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);

        try {

            WindowManagerGlobal.getWindowManagerService().dismissKeyguard();

        } catch (RemoteException e) {

        }

        dialog.show();

        dialog.show();

    }

    }