diff options
| author | 2024-08-28 09:38:33 +0000 | |
|---|---|---|
| committer | 2024-08-28 09:38:33 +0000 | |
| commit | 8aa2ea5a8ed22731be0c8c45cc90a68497e77e08 (patch) | |
| tree | bb50e7653752c69e4a14725f8f69e9bd1ac670ec | |
| parent | c3b16a4f73a41a26d88c647b271c33e309cf36c7 (diff) | |
| parent | 9c209525c4e8a8d74d3cbbdf69c2e41700927111 (diff) | |
Merge "Ensure MaximizeMenu is released after close animation" into main
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/MaximizeMenu.kt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/MaximizeMenu.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/MaximizeMenu.kt index deef37874e79..9c73e4a38aa9 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/MaximizeMenu.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/MaximizeMenu.kt @@ -121,8 +121,14 @@ class MaximizeMenu( /** Closes the maximize window and releases its view. */ fun close() { - maximizeMenuView?.animateCloseMenu { - maximizeMenu?.releaseView() + val view = maximizeMenuView + val menu = maximizeMenu + if (view == null) { + menu?.releaseView() + } else { + view.animateCloseMenu { + menu?.releaseView() + } } maximizeMenu = null maximizeMenuView = null |