summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Selim Cinek <cinek@google.com> 2016-05-10 17:11:54 -0400
committer Selim Cinek <cinek@google.com> 2016-05-10 17:11:54 -0400
commit6ac3fa8ebde529f4bc9d90bc2ac73bcd8634a494 (patch)
tree457dab813f2bbd7b935505262e23073d0ae55221
parentfa760d46369f1ee7baedd174cc8f973594c52970 (diff)
Fixed a bug where the content wasn't transforming in a group
Too many booleans. Change-Id: I1451484b1abcae3880448db60cff18ad97e9505f Fixes: 28677158
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java2
1 files changed, 1 insertions, 1 deletions
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 {