commit 1d4dc1ba91c254bf7bd547d4178cf69ddb47ba65
author Brian Isganitis <brianji@google.com> Thu Mar 03 17:54:12 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 03 17:54:12 2022 +0000
tree 076455d984e89729db2385363aecc015f100142a
parent 0968761a4a0e812b2a6cbf62ab5a80cb4d44518e
parent 8aa4b05d2244ddc57ecd7cdc986f4cddad37f093

Merge "Remove popup container drag listener on close complete." into sc-v2-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 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());