From 4423e58148897d05aff0e6cd4e205e6557c1bb7d Mon Sep 17 00:00:00 2001
From: cecilia <xiaotinghong@google.com>
Date: Mon, 13 Sep 2021 22:04:39 -0400
Subject: [PATCH] Bubbles up the long-press event from media rec item to the
 parent card.

Fixes: 194539523
Test: Local builds
Change-Id: I10fc0a80e8cada93fb3a8eb94d7103f48499b818
---
 .../com/android/systemui/media/MediaControlPanel.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
index b998fb50d0d55..e7445f920ffe2 100644
--- a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
@@ -254,7 +254,8 @@ public class MediaControlPanel {
                 openGuts();
                 return true;
             } else {
-                return false;
+                closeGuts();
+                return true;
             }
         });
         mRecommendationViewHolder.getCancel().setOnClickListener(v -> {
@@ -587,6 +588,14 @@ public class MediaControlPanel {
             ViewGroup mediaCoverContainer = mediaCoverContainers.get(uiComponentIndex);
             setSmartspaceRecItemOnClickListener(mediaCoverContainer, recommendation,
                     uiComponentIndex);
+            // Bubble up the long-click event to the card.
+            mediaCoverContainer.setOnLongClickListener(v -> {
+                View parent = (View) v.getParent();
+                if (parent != null) {
+                    parent.performLongClick();
+                }
+                return true;
+            });
 
             // Set up the accessibility label for the media item.
             String artistName = recommendation.getExtras()