From f41ec597ef152fe30ac5e3d667886aaf0e96da71 Mon Sep 17 00:00:00 2001
From: Jordan Silva <silvajordan@google.com>
Date: Tue, 18 Mar 2025 14:53:37 +0000
Subject: [PATCH] Set the elevation for TaskMenuView when overview icon menu is
 enabled.

Bug: 317007147
Flag: com.android.launcher3.enable_overview_icon_menu
Test: OverviewImageTest
Test: OverviewSplitTaskImageTest
Test: OverviewMenuImageTest
Change-Id: I7c8b0a181e39bdf2d2048b87d6ceecf2b95e3265
---
 quickstep/src/com/android/quickstep/views/TaskMenuView.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.kt b/quickstep/src/com/android/quickstep/views/TaskMenuView.kt
index 696f934701..3b5c857d6a 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.kt
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.kt
@@ -251,6 +251,7 @@ constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int = 0) :
         rotation = orientationHandler.degreesRotated
 
         if (enableOverviewIconMenu()) {
+            elevation = resources.getDimension(R.dimen.task_thumbnail_icon_menu_elevation)
             translationX = thumbnailAlignedX
             translationY = thumbnailAlignedY
         } else {
@@ -474,8 +475,8 @@ constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int = 0) :
             val isLastMenuOptionFocused =
                 optionLayout.indexOfChild(optionLayout.focusedChild) == optionLayout.childCount - 1
             if (
-                (isLastMenuOptionFocused && event.keyCode == KeyEvent.KEYCODE_DPAD_DOWN)
-                || (isFirstMenuOptionFocused && event.keyCode == KeyEvent.KEYCODE_DPAD_UP)
+                (isLastMenuOptionFocused && event.keyCode == KeyEvent.KEYCODE_DPAD_DOWN) ||
+                    (isFirstMenuOptionFocused && event.keyCode == KeyEvent.KEYCODE_DPAD_UP)
             ) {
                 iconView.requestFocus()
                 return true