diff options
author | Tony Wickham <twickham@google.com> | 2019-11-01 13:04:35 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2019-11-01 13:26:40 -0700 |
commit | 20af12eb3809892b828922480b2393efbeccca6d (patch) | |
tree | 8cbabfe434b27e81f82487eed994bed30b1dbe44 /src | |
parent | 329fca4550172c3075dc3437c1d9ba2a2491ef6e (diff) | |
download | packages_apps_Trebuchet-20af12eb3809892b828922480b2393efbeccca6d.tar.gz packages_apps_Trebuchet-20af12eb3809892b828922480b2393efbeccca6d.tar.bz2 packages_apps_Trebuchet-20af12eb3809892b828922480b2393efbeccca6d.zip |
Maintain dot and text visibility if a new popup is created while closing
Test:
- Long press an icon to open the popup
- Long press the same icon while the popup is open
Previously, the dot would reappear (when the original popup finished closing).
Now, the dot stays hidden, as it should since a popup is showing.
Bug: 143639898
Change-Id: Ia0bdb626e02f4ad9ba12c27d94fea054b4afe50e
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/popup/PopupContainerWithArrow.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java index 4833c26d8..e8ac1d4c9 100644 --- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java +++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java @@ -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(); } |