commit | 972ee06cdd097f96d89c01ab57b9a3013cbf0069 | [log] [tgz] |
---|---|---|
author | Jonathan Miranda <jonmiranda@google.com> | Wed Jun 30 03:18:57 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 30 03:18:57 2021 +0000 |
tree | 60f3f31d8fb28b51fb09ae583330bda71914ef6a | |
parent | 7642296862b9c3b78e4dcc437b427832cb25b143 [diff] | |
parent | 2178eedc6ac816861a28c569b945c00dbb94a185 [diff] |
Merge "Set elevation of popup and arrow to match. This ensures no shadow overlap." into sc-dev am: 26a485bb2a am: 2178eedc6a Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15147164 Change-Id: Ied9135487287293659cc407f11ea1b4ba8d841de
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); } }