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
This commit is contained in:
sfufa@google.com 2021-09-19 21:39:43 -07:00 committed by Samuel Fufa
parent 305d0463b1
commit 78e7b24eb7
1 changed files with 1 additions and 1 deletions

View File

@ -480,12 +480,12 @@ public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>
@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();
}
/**