Merge "Fix TaskMenuView to calculate bottom menu's max height" into main
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.kt b/quickstep/src/com/android/quickstep/views/TaskMenuView.kt
index 7c762f4..28d07de 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.kt
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.kt
@@ -366,13 +366,10 @@
deviceProfile = recentsViewContainer.deviceProfile,
taskMenuX = translationX,
taskMenuY =
- when {
- !enableOverviewIconMenu() -> translationY
- // Bottom menu can translate up to show more options. So we use the min
- // translation allowed to calculate its max height.
- taskView.isOnGridBottomRow() -> minMenuTop
- else -> menuTranslationYBeforeOpen
- },
+ // Bottom menu can translate up to show more options. So we use the min
+ // translation allowed to calculate its max height.
+ if (enableOverviewIconMenu() && taskView.isOnGridBottomRow()) minMenuTop
+ else translationY,
)
private fun setOnClosingStartCallback(onClosingStartCallback: Runnable?) {