From fa73c02172f8c9cae098a22c289b1c924dd09c41 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 29 Jun 2021 15:49:46 -0700
Subject: [PATCH] Set elevation of popup and arrow to match. This ensures no
 shadow overlap.

Bug: 191823198
Test: long press app where arrow is on top and bottom in:
      workspace, all apps, and search UI

Change-Id: Icc4ac259607175d5e12447a844ba166ba28b74af
---
 src/com/android/launcher3/popup/ArrowPopup.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index b7fe3480fa..a534ee3eb4 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -511,8 +511,8 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
                     mArrowOffsetHorizontal, -mArrowOffsetVertical,
                     !mIsAboveIcon, mIsLeftAligned,
                     mArrowColor));
-            // TODO: Remove elevation when arrow is above as it casts a shadow on the container
-            mArrow.setElevation(mIsAboveIcon ? mElevation : 0);
+            setElevation(mElevation);
+            mArrow.setElevation(mElevation);
         }
     }