commit 20af12eb3809892b828922480b2393efbeccca6d
author Tony Wickham <twickham@google.com> Fri Nov 01 13:04:35 2019 -0700
committer Tony Wickham <twickham@google.com> Fri Nov 01 13:26:40 2019 -0700
tree 8cbabfe434b27e81f82487eed994bed30b1dbe44
parent 329fca4550172c3075dc3437c1d9ba2a2491ef6e

Maintain dot and text visibility if a new popup is created while closing

Test:
- Long press an icon to open the popup
- Long press the same icon while the popup is open

Previously, the dot would reappear (when the original popup finished closing).
Now, the dot stays hidden, as it should since a popup is showing.

Bug: 143639898
Change-Id: Ia0bdb626e02f4ad9ba12c27d94fea054b4afe50e

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 4833c26..e8ac1d4 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -575,8 +575,11 @@
 
     @Override
     protected void closeComplete() {
-        mOriginalIcon.setTextVisibility(mOriginalIcon.shouldTextBeVisible());
-        mOriginalIcon.setForceHideDot(false);
+        PopupContainerWithArrow openPopup = getOpen(mLauncher);
+        if (openPopup == null || openPopup.mOriginalIcon != mOriginalIcon) {
+            mOriginalIcon.setTextVisibility(mOriginalIcon.shouldTextBeVisible());
+            mOriginalIcon.setForceHideDot(false);
+        }
         super.closeComplete();
     }