From 6ac3fa8ebde529f4bc9d90bc2ac73bcd8634a494 Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Tue, 10 May 2016 17:11:54 -0400
Subject: Fixed a bug where the content wasn't transforming in a group

Too many booleans.

Change-Id: I1451484b1abcae3880448db60cff18ad97e9505f
Fixes: 28677158
---
 .../src/com/android/systemui/statusbar/NotificationContentView.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
index 334d3fa02a07..45e3feeb7031 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
@@ -706,7 +706,7 @@ public class NotificationContentView extends FrameLayout {
             }
         } else {
             if (noExpandedChild || (viewHeight <= mContractedChild.getHeight()
-                    && (!mIsChildInGroup
+                    && (!mIsChildInGroup || isGroupExpanded()
                             || !mContainingNotification.isExpanded(true /* allowOnKeyguard */)))) {
                 return VISIBLE_TYPE_CONTRACTED;
             } else {
-- 
cgit v1.2.3-59-g8ed1b