Merge "Fixed a bug where the content wasn't transforming in a group" into nyc-dev

This commit is contained in:
Selim Cinek
2016-05-10 23:14:00 +00:00
committed by Android (Google) Code Review

View File

@@ -742,7 +742,7 @@ public class NotificationContentView extends FrameLayout {
}
} else {
if (noExpandedChild || (viewHeight <= mContractedChild.getHeight()
&& (!mIsChildInGroup
&& (!mIsChildInGroup || isGroupExpanded()
|| !mContainingNotification.isExpanded(true /* allowOnKeyguard */)))) {
return VISIBLE_TYPE_CONTRACTED;
} else {