commit 285a1a7c9ab54dfa1db8ae2f5de9fb85f5f162c4
author Brian Isganitis <brianji@google.com> Wed Sep 29 17:09:43 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 29 17:09:43 2021 +0000
tree 485106188006ae2a4a55eafb95741f48db356b51
parent efcbfc97ecf81fc28acaebf94ed56d4d4959e6a0
parent 52b9feb353e547a4577d13a76f99e8164ee0cbf9

Merge "Update arrow color after all notifications dismissed." into sc-v2-dev am: 3a91a6241f am: 52b9feb353

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

Change-Id: Ie93b7aa71dbcd9545d2fc617101ed4a36db54742

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 117ae42..1a5d141 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -495,7 +495,7 @@
         mArrow.setPivotY(mIsAboveIcon ? mArrowHeight : 0);
     }
 
-    private void updateArrowColor() {
+    protected void updateArrowColor() {
         if (!Gravity.isVertical(mGravity)) {
             mArrow.setBackground(new RoundedArrowDrawable(
                     mArrowWidth, mArrowHeight, mArrowPointRadius,

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

diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 0fe147c..23f3984 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -598,6 +598,7 @@
                 mNotificationContainer.setVisibility(GONE);
                 updateHiddenShortcuts();
                 assignMarginsAndBackgrounds(PopupContainerWithArrow.this);
+                updateArrowColor();
             } else {
                 mNotificationContainer.trimNotifications(
                         NotificationKeyData.extractKeysOnly(dotInfo.getNotificationKeys()));