diff options
| author | Tony Wickham <twickham@google.com> | 2019-11-01 23:38:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-11-01 23:38:51 +0000 |
| commit | c1fafebd472e96fb3a0bac924ae8a0db9172c874 (patch) | |
| tree | 6069794ac6a96bf81b54f09eb197040a9799de16 /src | |
| parent | 23df556ec40b096eb562503ebe25f12adf0305c3 (diff) | |
| parent | 20af12eb3809892b828922480b2393efbeccca6d (diff) | |
| download | android_packages_apps_Trebuchet-c1fafebd472e96fb3a0bac924ae8a0db9172c874.tar.gz android_packages_apps_Trebuchet-c1fafebd472e96fb3a0bac924ae8a0db9172c874.tar.bz2 android_packages_apps_Trebuchet-c1fafebd472e96fb3a0bac924ae8a0db9172c874.zip | |
Merge "Maintain dot and text visibility if a new popup is created while closing" into ub-launcher3-qt-future-dev
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(); } |