commit d942b4208d258d7b80c557e2f82d9be1b81c7836
author Tony Wickham <twickham@google.com> Fri Nov 01 23:39:18 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 01 23:39:18 2019 +0000
tree 4589128e1c2809bd6a18e7bb0fead79917f4610a
parent c1fafebd472e96fb3a0bac924ae8a0db9172c874
parent 6894f4f1bb833822f335a01191cae2dfcf604fbc

Merge "Fix issue where popup jumps to full size before closing" into ub-launcher3-qt-future-dev

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();
     }