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

Commit 5cebf964 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix collapsed group message text alignment" into rvc-dev am: 728da700 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871447

Change-Id: I0a9e9d6f01d040c58fb1e9464ecf719c1b86d435
parents 0d1ca336 728da700

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -110,6 +110,7 @@ public class MessagingGroup extends LinearLayout implements MessagingLinearLayou 
    private ViewGroup mMessagingIconContainer;

    private ViewGroup mMessagingIconContainer;

    private int mConversationContentStart;

    private int mConversationContentStart;

    private int mNonConversationMarginEnd;

    private int mNonConversationMarginEnd;

    private int mNotificationTextMarginTop;





    public MessagingGroup(@NonNull Context context) {

    public MessagingGroup(@NonNull Context context) {

        super(context);

        super(context);
@@ -149,6 +150,8 @@ public class MessagingGroup extends LinearLayout implements MessagingLinearLayou 
                R.dimen.conversation_content_start);

                R.dimen.conversation_content_start);

        mNonConversationMarginEnd = getResources().getDimensionPixelSize(

        mNonConversationMarginEnd = getResources().getDimensionPixelSize(

                R.dimen.messaging_layout_margin_end);

                R.dimen.messaging_layout_margin_end);

        mNotificationTextMarginTop = getResources().getDimensionPixelSize(

                R.dimen.notification_text_margin_top);

    }

    }





    public void updateClipRect() {

    public void updateClipRect() {
@@ -665,6 +668,9 @@ public class MessagingGroup extends LinearLayout implements MessagingLinearLayou 
    public void setSingleLine(boolean singleLine) {

    public void setSingleLine(boolean singleLine) {

        if (singleLine != mSingleLine) {

        if (singleLine != mSingleLine) {

            mSingleLine = singleLine;

            mSingleLine = singleLine;

            MarginLayoutParams p = (MarginLayoutParams) mMessageContainer.getLayoutParams();

            p.topMargin = singleLine ? 0 : mNotificationTextMarginTop;

            mMessageContainer.setLayoutParams(p);

            mContentContainer.setOrientation(

            mContentContainer.setOrientation(

                    singleLine ? LinearLayout.HORIZONTAL : LinearLayout.VERTICAL);

                    singleLine ? LinearLayout.HORIZONTAL : LinearLayout.VERTICAL);

            MarginLayoutParams layoutParams = (MarginLayoutParams) mSenderView.getLayoutParams();

            MarginLayoutParams layoutParams = (MarginLayoutParams) mSenderView.getLayoutParams();

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

+21 −0
Original line number Original line Diff line number Diff line
@@ -300,6 +300,27 @@ public class MessagingLinearLayout extends ViewGroup { 
        return mMessagingLayout;

        return mMessagingLayout;

    }

    }





    @Override

    public int getBaseline() {

        // When placed in a horizontal linear layout (as is the case in a single-line MessageGroup),

        // align with the last visible child (which is the one that will be displayed in the single-

        // line group.

        int childCount = getChildCount();

        for (int i = childCount - 1; i >= 0; i--) {

            final View child = getChildAt(i);

            if (isGone(child)) {

                continue;

            }

            final int childBaseline = child.getBaseline();

            if (childBaseline == -1) {

                return -1;

            }

            MarginLayoutParams lp = (MarginLayoutParams) child.getLayoutParams();

            return lp.topMargin + childBaseline;

        }

        return super.getBaseline();

    }



    public interface MessagingChild {

    public interface MessagingChild {

        int MEASURED_NORMAL = 0;

        int MEASURED_NORMAL = 0;

        int MEASURED_SHORTENED = 1;

        int MEASURED_SHORTENED = 1;

core/res/res/layout/notification_template_messaging_group.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -37,6 +37,7 @@ 
        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_weight="1"

        android:baselineAligned="true"

        android:orientation="vertical">

        android:orientation="vertical">

        <com.android.internal.widget.ImageFloatingTextView

        <com.android.internal.widget.ImageFloatingTextView

            android:id="@+id/message_name"

            android:id="@+id/message_name"