Merge "Fixes a visual issue with the Messaging Layout" into pi-dev

This commit is contained in:
android-build-team Robot
2018-05-03 22:20:04 +00:00
committed by Android (Google) Code Review

View File

@@ -276,9 +276,16 @@ public class MessagingGroup extends LinearLayout implements MessagingLinearLayou
boolean hasNormal = false;
for (int i = mMessageContainer.getChildCount() - 1; i >= 0; i--) {
View child = mMessageContainer.getChildAt(i);
if (child.getVisibility() == GONE) {
continue;
}
if (child instanceof MessagingLinearLayout.MessagingChild) {
int type = ((MessagingLinearLayout.MessagingChild) child).getMeasuredType();
if (type == MEASURED_TOO_SMALL) {
boolean tooSmall = type == MEASURED_TOO_SMALL;
final MessagingLinearLayout.LayoutParams lp =
(MessagingLinearLayout.LayoutParams) child.getLayoutParams();
tooSmall |= lp.hide;
if (tooSmall) {
if (hasNormal) {
return MEASURED_SHORTENED;
} else {