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

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

Merge "Fixed an issue where the messaging layout could appear empty" into pi-dev 

am: 1e543887

Change-Id: I0bfda0c9b5700f5d1d27133b0ac9b7d8640d4e60
parents 54715a40 1e543887

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

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ public class MessagingTextMessage extends ImageFloatingTextView implements Messa 
    public int getMeasuredType() {

        boolean measuredTooSmall = getMeasuredHeight()

                < getLayoutHeight() + getPaddingTop() + getPaddingBottom();

        if (measuredTooSmall) {

        if (measuredTooSmall && getLineCount() <= 1) {

            return MEASURED_TOO_SMALL;

        } else {

            Layout layout = getLayout();

core/res/res/layout/notification_template_messaging_group.xml

+1 −2
Original line number Diff line number Diff line
@@ -42,8 +42,7 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/notification_text_margin_top"

            android:spacing="2dp"

            android:layout_weight="1"/>

            android:spacing="2dp"/>

    </com.android.internal.widget.RemeasuringLinearLayout>

    <FrameLayout

        android:id="@+id/messaging_group_icon_container"