From 78e7b24eb7e2a4706acb9bababc27f890c56cd89 Mon Sep 17 00:00:00 2001 From: "sfufa@google.com" Date: Sun, 19 Sep 2021 21:39:43 -0700 Subject: [PATCH] Restore hidden text on Popup close When handleClose is called with no animation, overridden closeComplete gets fired before mOpen is set to false inside the super class. This results in getOpenView(launcher, TYPE_ACTION_POPUP) returning self and breaking text visibility restore. Bug: 183713889 Test: Long press on allapps/workspace item to show PopUp under it; on popup open, capture screenshot, start a sharing activity, return to launcher and verify popup dismissed and text restored. Change-Id: Iae8d2c73e4b7f57708468bf47bb0983a30ebbddc --- src/com/android/launcher3/popup/PopupContainerWithArrow.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java index bc3419aa81..454dc6e651 100644 --- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java +++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java @@ -480,12 +480,12 @@ public class PopupContainerWithArrow> @Override protected void closeComplete() { + super.closeComplete(); PopupContainerWithArrow openPopup = getOpen(mLauncher); if (openPopup == null || openPopup.mOriginalIcon != mOriginalIcon) { mOriginalIcon.setTextVisibility(mOriginalIcon.shouldTextBeVisible()); mOriginalIcon.setForceHideDot(false); } - super.closeComplete(); } /**