commit a2a635ca02bd136842622315e1a5b9188868d8f9
author Jonathan Miranda <jonmiranda@google.com> Wed Jun 30 03:18:22 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 30 03:18:22 2021 +0000
tree e9f1739527c0d40b54e5a06cbb4e41475131ae75
parent 1b0cfbb8a267ad399b74586caad87161b055d5c4
parent 9e6bc67ad27e36279c2ce53b042f0766729c994d

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

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

Change-Id: Ifd504a1f7de5fbe7e04428dbb3703850c9043af0

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);
         }
     }