commit b6efb6e2b54b405d3b4a3f8abc8bf1506cb76d1a
author Jonathan Miranda <jonmiranda@google.com> Wed Jun 30 03:05:54 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 30 03:05:54 2021 +0000
tree 5eaecd793a475e5400f811ff807f7f24201c3326
parent db36b95d56421dc4459c0b512597f2bd272223bd
parent 26a485bb2a7367e3af9a937c852016a3d3e1d403

Merge "Set elevation of popup and arrow to match. This ensures no shadow overlap." into sc-dev am: 26a485bb2a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15147164

Change-Id: I848717324d99559141b25787ff8b2a50d15a36aa

src/com/android/launcher3/popup/ArrowPopup.java

diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index b7fe348..a534ee3 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -511,8 +511,8 @@
                     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);
         }
     }