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

Commit 7a101f76 authored by mattsziklay's avatar mattsziklay
Browse files

Close Manage Windows Menu when other menus are closed. 

Prevent the Manage Windows menu from dispalying when it should be
dismissed, similar to when handle and maximize menus are cleaned up.

Bug: 368065874
Test: Manual
Flag: com.android.window.flags.enable_desktop_windowing_multi_instance_features
Change-Id: Ide878bc47008a044faab294731ba84fd6280ceb9
parent ec3c8b5e

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java

+7 −1
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 


        if (!mTaskInfo.isFocused) {

            closeHandleMenu();

            closeManageWindowsMenu();

            closeMaximizeMenu();

        }

        updateDragResizeListener(oldDecorationSurface);
@@ -1065,8 +1066,11 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
    }



    void closeManageWindowsMenu() {

        if (mManageWindowsMenu != null) {

            mManageWindowsMenu.close();

        }

        mManageWindowsMenu = null;

    }



    private void updateGenericLink() {

        final ComponentName baseActivity = mTaskInfo.baseActivity;
@@ -1092,6 +1096,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
    @Override

    void releaseViews(WindowContainerTransaction wct) {

        closeHandleMenu();

        closeManageWindowsMenu();

        closeMaximizeMenu();

        super.releaseViews(wct);

    }
@@ -1255,6 +1260,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
    public void close() {

        closeDragResizeListener();

        closeHandleMenu();

        closeManageWindowsMenu();

        mExclusionRegionListener.onExclusionRegionDismissed(mTaskInfo.taskId);

        disposeResizeVeil();

        disposeStatusBarInputLayer();