commit 8aa4b05d2244ddc57ecd7cdc986f4cddad37f093
author Brian Isganitis <brianji@google.com> Fri Feb 18 11:11:25 2022 -0800
committer Brian Isganitis <brianji@google.com> Fri Feb 18 21:18:33 2022 +0000
tree 670995bef27dcc48eeac7762caaa520a31cda8a6
parent 0fb7fa4e300230a6a4ae0c58cfa1c365db457c78

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

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