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.
This commit is contained in:
Brian Isganitis
2022-03-03 17:54:12 +00:00
committed by Android (Google) Code Review

View File

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