summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2018-05-29 22:44:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-05-29 22:44:09 +0000
commit0512a6de57ebe8af9722964c6ade74b6d3df6175 (patch)
treec444afe96aaef31b05286b1e3107c858fb527560
parentad361780fecd1773c0a81786130c1c83626bf5c9 (diff)
parentbb9378aead84fe55c2a0edcf190008b0b7b52c20 (diff)
downloadandroid_packages_apps_Trebuchet-0512a6de57ebe8af9722964c6ade74b6d3df6175.tar.gz
android_packages_apps_Trebuchet-0512a6de57ebe8af9722964c6ade74b6d3df6175.tar.bz2
android_packages_apps_Trebuchet-0512a6de57ebe8af9722964c6ade74b6d3df6175.zip
Merge "Unhide badge when popup closes without animation" into ub-launcher3-edmonton
-rw-r--r--src/com/android/launcher3/popup/PopupContainerWithArrow.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index f276fbfea..172cf41e0 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -527,6 +527,7 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource,
protected void closeComplete() {
super.closeComplete();
mOriginalIcon.setTextVisibility(mOriginalIcon.shouldTextBeVisible());
+ mOriginalIcon.forceHideBadge(false);
}
@Override