From f10ecccdf7ac55245d4f306593f89b0a87cac2d5 Mon Sep 17 00:00:00 2001 From: Brian Isganitis Date: Fri, 18 Feb 2022 18:35:38 +0000 Subject: [PATCH] Revert "Remove popup container drag listener on close complete." This reverts commit 1f7afc7740207d5438c80f52af1c9b8002bc045a. Reason for revert: Not all activity contexts have a drag controller, so this will cause a crash within those (e.g. SecondaryDisplayLauncher). Change-Id: Idf7c880d8213951d06fecc3fb8cf6e8efd2037b0 --- src/com/android/launcher3/popup/PopupContainerWithArrow.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java index 05d6fc6c15..198397a5e1 100644 --- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java +++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java @@ -508,7 +508,6 @@ public class PopupContainerWithArrow @Override protected void closeComplete() { super.closeComplete(); - mActivityContext.getDragController().removeDragListener(this); PopupContainerWithArrow openPopup = getOpen(mActivityContext); if (openPopup == null || openPopup.mOriginalIcon != mOriginalIcon) { mOriginalIcon.setTextVisibility(mOriginalIcon.shouldTextBeVisible());