From 084c16b8b380e7ff0d38d9e2846db321f0214931 Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Fri, 22 Jan 2016 17:48:22 -0800
Subject: [PATCH] Fixed a clipping bug when expanding children notification

When children are expanded with a finger we still need to clip!

Change-Id: Ie66bb0ba690163bcabdc503a03f1e23869ec175d
---
 .../android/systemui/statusbar/ExpandableNotificationRow.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
index 52e6a9c2caf76..93be009c29fd1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
@@ -652,8 +652,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
 
     @Override
     public void setClipToActualHeight(boolean clipToActualHeight) {
-        super.setClipToActualHeight(clipToActualHeight);
-        getShowingLayout().setClipToActualHeight(clipToActualHeight);
+        super.setClipToActualHeight(clipToActualHeight || isUserLocked());
+        getShowingLayout().setClipToActualHeight(clipToActualHeight || isUserLocked());
     }
 
     /**