From 8aa4b05d2244ddc57ecd7cdc986f4cddad37f093 Mon Sep 17 00:00:00 2001
From: Brian Isganitis <brianji@google.com>
Date: Fri, 18 Feb 2022 11:11:25 -0800
Subject: [PATCH] Remove popup container drag listener on close complete.

Bug: 217162588
Test: Verified removal once drag is finished. Verified working on secondary display launcher.
Change-Id: I16515518c6d488b74450456306abbfff646ac11b
Merged-In: I16515518c6d488b74450456306abbfff646ac11b
---
 src/com/android/launcher3/popup/PopupContainerWithArrow.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index b2619701b8..6d2b12f451 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -486,6 +486,9 @@ public class PopupContainerWithArrow<T extends Context & ActivityContext>
     @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());