From c8007c59758b166f262f1e9d8ec19c36bf37b607 Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Tue, 28 Feb 2017 16:09:56 -0800
Subject: [PATCH] Fixed a bug where the icon would dissappear

If we were inflated on the lockscreen as the only child
the icon would dissappear.

Test: send multiple messages, kill systemui, observe
Change-Id: I81c433292f6839920b99ac124ca1dd17eb6e962e
---
 .../android/systemui/statusbar/ExpandableNotificationRow.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
index bc790709aa4d9..602c3dfde73e6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
@@ -2018,7 +2018,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
 
     @Override
     public boolean isAboveShelf() {
-        return mIsPinned || mHeadsupDisappearRunning || (mIsHeadsUp && mAboveShelf);
+        return !isOnKeyguard()
+                && (mIsPinned || mHeadsupDisappearRunning || (mIsHeadsUp && mAboveShelf));
     }
 
     public void setShowAmbient(boolean showAmbient) {