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

Commit e8e17362 authored by Alison Cichowlas's avatar Alison Cichowlas Committed by android-build-merger
Browse files

Merge "Make back button dismiss power dialog, by making dialog focusable."... 

Merge "Make back button dismiss power dialog, by making dialog focusable." into oc-dr1-dev am: 5110b31d
am: 41003287

Change-Id: Icb122e8ec2a84e8caf2f3438805d232b019cac90
parents c756ca25 41003287

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+2 −2
Original line number Diff line number Diff line
@@ -1238,8 +1238,8 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, DialogIn 
            window.requestFeature(Window.FEATURE_NO_TITLE);

            window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND

                    | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR);

            window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE

                    | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN

            window.addFlags(

                    WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN

                    | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL

                    | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED

                    | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH