Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Selim Cinek
2018-08-17 21:37:04 +00:00
committed by Android (Google) Code Review
parent 283f55f7de 3c2fd6a1d7
commit 99168a6371
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/widget/MessagingLinearLayout.java
View File

@@ -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(