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

Commit e206929d authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed an issue where the message could be empty" into pi-dev 

am: 99168a63

Change-Id: I848486310a74b37dcac41bf81a5746ca15dc0d7d
parents 6497c5bd 99168a63

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

+6 −3
Original line number Diff line number Diff line
@@ -111,14 +111,16 @@ public class MessagingLinearLayout extends ViewGroup { 
            final int childHeight = child.getMeasuredHeight();

            int newHeight = Math.max(totalHeight, totalHeight + childHeight + lp.topMargin +

                    lp.bottomMargin + spacing);

            first = false;

            int measureType = MessagingChild.MEASURED_NORMAL;

            if (messagingChild != null) {

                measureType = messagingChild.getMeasuredType();

                linesRemaining -= messagingChild.getConsumedLines();

            }

            boolean isShortened = measureType == MessagingChild.MEASURED_SHORTENED;

            boolean isTooSmall = measureType == MessagingChild.MEASURED_TOO_SMALL;



            // We never measure the first item as too small, we want to at least show something.

            boolean isTooSmall = measureType == MessagingChild.MEASURED_TOO_SMALL && !first;

            boolean isShortened = measureType == MessagingChild.MEASURED_SHORTENED

                    || measureType == MessagingChild.MEASURED_TOO_SMALL && first;

            if (newHeight <= targetHeight && !isTooSmall) {

                totalHeight = newHeight;

                measuredWidth = Math.max(measuredWidth,
@@ -131,6 +133,7 @@ public class MessagingLinearLayout extends ViewGroup { 
            } else {

                break;

            }

            first = false;

        }



        setMeasuredDimension(