From 7e9344f83c1f24dfc28f10124c280bd6b665c073 Mon Sep 17 00:00:00 2001
From: Priyank Singh <priyanksingh@google.com>
Date: Tue, 7 May 2019 14:30:13 -0700
Subject: [PATCH] HUN should not show up when the Notification shade is open

Bug: 132131722
Test: Manual
Change-Id: Id759421fd402e917ca4722df6fb597b5991ed31d
(cherry picked from commit ff78b8ec8c31e3eac40db5d321dd6926ef0903a1)
---
 .../src/com/android/systemui/statusbar/car/CarStatusBar.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
index 7fbdc2ed844ba..8373761962ac2 100644
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
+++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
@@ -1259,6 +1259,10 @@ public class CarStatusBar extends StatusBar implements
 
         @Override
         protected void setHeadsUpVisible() {
+            // if the Notifications panel is showing don't show the Heads up
+            if (mPanelExpanded) {
+                return;
+            }
             super.setHeadsUpVisible();
             if (mHeadsUpPanel.getVisibility() == View.VISIBLE) {
                 mStatusBarWindowController.setHeadsUpShowing(true);