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

Commit 9281e5e1 authored by Selim Cinek's avatar Selim Cinek
Browse files

Better messaging style wrapping 

Messaging style is now not dropping previous messages
anymore if they don't fit completely. Instead we are
truncating it.

Test: send various text messages, observe nice layout
Fixes: 35944700
Change-Id: I0a08b06bf7624ee62e81bfd384721c8458c9c9d4
parent 365ec096

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

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ public class ImageFloatingTextView extends TextView { 
        // Lets calculate how many lines the given measurement allows us.

        int availableHeight = height - mPaddingTop - mPaddingBottom;

        int maxLines = availableHeight / getLineHeight();

        maxLines = Math.max(1, maxLines);

        if (getMaxLines() > 0) {

            maxLines = Math.min(getMaxLines(), maxLines);

        }

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

+24 −9
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.internal.widget;



import com.android.internal.R;



import android.annotation.Nullable;

import android.content.Context;

import android.content.res.TypedArray;
@@ -28,6 +26,8 @@ import android.view.View; 
import android.view.ViewGroup;

import android.widget.RemoteViews;



import com.android.internal.R;



/**

 * A custom-built layout for the Notification.MessagingStyle.

 *
@@ -119,23 +119,30 @@ public class MessagingLinearLayout extends ViewGroup { 
                }

                final View child = getChildAt(i);

                LayoutParams lp = (LayoutParams) getChildAt(i).getLayoutParams();



                ImageFloatingTextView textChild = null;

                if (child instanceof ImageFloatingTextView) {

                    // Pretend we need the image padding for all views, we don't know which

                    // one will end up needing to do this (might end up not using all the space,

                    // but calculating this exactly would be more expensive).

                    ((ImageFloatingTextView) child).setNumIndentLines(

                            mIndentLines == 2 ? 3 : mIndentLines);

                    textChild = (ImageFloatingTextView) child;

                    textChild.setNumIndentLines(mIndentLines == 2 ? 3 : mIndentLines);

                }



                measureChildWithMargins(child, widthMeasureSpec, 0, heightMeasureSpec, 0);

                int spacing = first ? 0 : mSpacing;

                measureChildWithMargins(child, widthMeasureSpec, 0, heightMeasureSpec, totalHeight

                        - mPaddingTop - mPaddingBottom + spacing);



                final int childHeight = child.getMeasuredHeight();

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

                        lp.bottomMargin + (first ? 0 : mSpacing));

                        lp.bottomMargin + spacing);

                first = false;

                boolean measuredTooSmall = false;

                if (textChild != null) {

                    measuredTooSmall = childHeight < textChild.getLayout().getHeight()

                            + textChild.getPaddingTop() + textChild.getPaddingBottom();

                }



                if (newHeight <= targetHeight) {

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

                    totalHeight = newHeight;

                    lp.hide = false;

                } else {
@@ -168,7 +175,15 @@ public class MessagingLinearLayout extends ViewGroup { 
                }

                boolean changed = textChild.setNumIndentLines(Math.max(0, imageLines));

                if (changed || !recalculateVisibility) {

                    measureChildWithMargins(child, widthMeasureSpec, 0, heightMeasureSpec, 0);

                    final int childWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec,

                            mPaddingLeft + mPaddingRight + lp.leftMargin + lp.rightMargin,

                            lp.width);

                    // we want to measure it at most as high as it is currently, otherwise we'll

                    // drop later lines

                    final int childHeightMeasureSpec = getChildMeasureSpec(heightMeasureSpec,

                            targetHeight - child.getMeasuredHeight(), lp.height);



                    child.measure(childWidthMeasureSpec, childHeightMeasureSpec);;

                }

                imageLines -= textChild.getLineCount();

            }