Merge "HUN should not show up when the Notification shade is open" into qt-dev

am: 17f08878e2

Change-Id: Ic7a2c2efa23c28be8d2a553b757088b91a2e3507

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);