Merge "Ensure MaximizeMenu is released after close animation" into main (8aa2ea5a) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/MaximizeMenu.kt

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -121,8 +121,14 @@ class MaximizeMenu(

	/** Closes the maximize window and releases its view. */		/** Closes the maximize window and releases its view. */
	fun close() {		fun close() {
	maximizeMenuView?.animateCloseMenu {		val view = maximizeMenuView
	maximizeMenu?.releaseView()		val menu = maximizeMenu
			if (view == null) {
			menu?.releaseView()
			} else {
			view.animateCloseMenu {
			menu?.releaseView()
			}
	}		}
	maximizeMenu = null		maximizeMenu = null
	maximizeMenuView = null		maximizeMenuView = null