commit 087e879b2541e8e65cce1dce236656c4969c5cd0
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 af8ec439dffacd36f9de133f875ca068275f45c6
parent 50aba07a4010575d9d21e276f715e7844059f9a5
parent 2a4f1111e69fa71ea48286a48a951c5708b46a29

Merge changes from topic "presubmit-am-4c8411152aef49f099eee419e063b01e" into sc-v2-dev-plus-aosp

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

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