[automerge] Remove popup container drag listener on close complete. 2p: 8aa4b05d22

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

Bug: 217162588
Change-Id: Ifecc5533324e4669d7742a0ee75c4d57d5b868ca
Merged-In: I16515518c6d488b74450456306abbfff646ac11b
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index b261970..6d2b12f 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -486,6 +486,9 @@
     @Override
     protected void closeComplete() {
         super.closeComplete();
+        if (mActivityContext.getDragController() != null) {
+            mActivityContext.getDragController().removeDragListener(this);
+        }
         PopupContainerWithArrow openPopup = getOpen(mActivityContext);
         if (openPopup == null || openPopup.mOriginalIcon != mOriginalIcon) {
             mOriginalIcon.setTextVisibility(mOriginalIcon.shouldTextBeVisible());