Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87d531ed authored by android-build-team Robot's avatar android-build-team Robot Committed by android-build-merger
Browse files

Merge "Fixes a visual issue with the Messaging Layout" into pi-dev am: 8e4b8ea3 

am: f0f07467

Change-Id: I93da4f1495f292b831ca66098c6c383c02a45007
parents e8996a06 f0f07467

core/java/com/android/internal/widget/MessagingGroup.java

+8 −1
Original line number Diff line number Diff line
@@ -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 {