Merge "Close Manage Windows Menu when other menus are closed." into main (ba72d5ed) · Commits · e / os / android_frameworks_base

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

+7 −1

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

		if (!mTaskInfo.isFocused) {
		closeHandleMenu();
		closeManageWindowsMenu();
		closeMaximizeMenu();
		}
		updateDragResizeListener(oldDecorationSurface);
		@@ -1150,8 +1151,11 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin
		}

		void closeManageWindowsMenu() {
		if (mManageWindowsMenu != null) {
		mManageWindowsMenu.close();
		}
		mManageWindowsMenu = null;
		}

		private void updateGenericLink() {
		final ComponentName baseActivity = mTaskInfo.baseActivity;
		@@ -1180,6 +1184,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin
		@Override
		void releaseViews(WindowContainerTransaction wct) {
		closeHandleMenu();
		closeManageWindowsMenu();
		closeMaximizeMenu();
		super.releaseViews(wct);
		}
		@@ -1343,6 +1348,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin
		public void close() {
		closeDragResizeListener();
		closeHandleMenu();
		closeManageWindowsMenu();
		mExclusionRegionListener.onExclusionRegionDismissed(mTaskInfo.taskId);
		disposeResizeVeil();
		disposeStatusBarInputLayer();