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

Commit 6560ab75 authored by Aran Ink's avatar Aran Ink
Browse files

Ensure power menu overflow dismissed when dialog dismissed. 

Test: Manual -- pressing power button while power overflow menu is shown does not result in overflow menu still appearing on lock screen.

Fixes: 154441764
Change-Id: Icc7d158a7ff78b06d2234a5a11eb10b3c75a5ba7
parent 7c8fea9b

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

+8 −0
Original line number Diff line number Diff line
@@ -2230,6 +2230,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
                    })

                    .start();

            dismissPanel();

            dismissOverflow();

            resetOrientation();

        }
@@ -2237,6 +2238,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
            mShowing = false;

            if (mControlsUiController != null) mControlsUiController.hide();

            dismissPanel();

            dismissOverflow();

            resetOrientation();

            completeDismiss();

        }
@@ -2253,6 +2255,12 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
            }

        }



        private void dismissOverflow() {

            if (mOverflowPopup != null) {

                mOverflowPopup.dismiss();

            }

        }



        private void setRotationSuggestionsEnabled(boolean enabled) {

            try {

                final int userId = Binder.getCallingUserHandle().getIdentifier();