commit 59a53e4a43e3f17e9b7c064c9c390af34c9b2510
author Tony Wickham <twickham@google.com> Fri Nov 01 16:59:22 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Nov 01 16:59:22 2019 -0700
tree 2453bfe3d97ab40c0582214125f9aaa246db15ed
parent a4f3ffef7a51fa2f6758a9b4c5c78a27aac15d5b
parent c1fafebd472e96fb3a0bac924ae8a0db9172c874

Merge "Maintain dot and text visibility if a new popup is created while closing" into ub-launcher3-qt-future-dev
am: c1fafebd47

Change-Id: I64870047d8bbcdcbc01b767da52c734f946480af

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 79b41c1..e70673a 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -570,8 +570,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();
     }