Merge "Maintain dot and text visibility if a new popup is created while closing" into ub-launcher3-qt-future-dev

This commit is contained in:
Tony Wickham
2019-11-01 23:38:51 +00:00
committed by Android (Google) Code Review

View File

@@ -575,8 +575,11 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource,
@Override
protected void closeComplete() {
mOriginalIcon.setTextVisibility(mOriginalIcon.shouldTextBeVisible());
mOriginalIcon.setForceHideDot(false);
PopupContainerWithArrow openPopup = getOpen(mLauncher);
if (openPopup == null || openPopup.mOriginalIcon != mOriginalIcon) {
mOriginalIcon.setTextVisibility(mOriginalIcon.shouldTextBeVisible());
mOriginalIcon.setForceHideDot(false);
}
super.closeComplete();
}