commit 78bf9b626568711f0e18a67309fc6799eaa281f8
author Tony Wickham <twickham@google.com> Tue May 29 22:44:10 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 29 22:44:10 2018 +0000
tree 9653fb215989e5d9d45cd02f66b9eca2ed8cb878
parent bc72fb2376354d2209195488019c87ee4b2df445
parent b052aabc6ee68bf11221fd481ee3da86c58e535a

Merge changes from topic "am-44d997ce-f83c-4bd7-aee0-6ab74e7269f5" into ub-launcher3-master

* changes:
  [automerger] Unhide badge when popup closes without animation am: bb9378aead am: d7eaf26425
  [automerger] Unhide badge when popup closes without animation am: bb9378aead
  Unhide badge when popup closes without animation

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 f276fbf..172cf41 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -527,6 +527,7 @@
     protected void closeComplete() {
         super.closeComplete();
         mOriginalIcon.setTextVisibility(mOriginalIcon.shouldTextBeVisible());
+        mOriginalIcon.forceHideBadge(false);
     }
 
     @Override