From 03302548ae2f48e25d31de96e566e4e1d1e8e038 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 22 Aug 2019 17:03:58 -0700
Subject: [PATCH] Close shortcut menu after launching from hotseat

+ Fixed bug where popup menu does not close when animations are disabled.

Test: Manual
Bug:123298377
Change-Id: I863241158e09a618af6243d8afd70549421013d0
---
 .../android/launcher3/popup/PopupContainerWithArrow.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 1296a969dd..2a40d683e8 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -166,7 +166,10 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource,
     }
 
     public OnClickListener getItemClickListener() {
-        return ItemClickHandler.INSTANCE;
+        return (view) -> {
+            ItemClickHandler.INSTANCE.onClick(view);
+            close(true);
+        };
     }
 
     @Override
@@ -564,9 +567,9 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource,
 
     @Override
     protected void closeComplete() {
-        super.closeComplete();
         mOriginalIcon.setTextVisibility(mOriginalIcon.shouldTextBeVisible());
         mOriginalIcon.forceHideDot(false);
+        super.closeComplete();
     }
 
     @Override