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

Merge "Fixes a visual issue with the Messaging Layout" into pi-dev

Browse Source 
am: 8e4b8ea38a

Change-Id: Ic167c21cf545705c167d6444c862a2247a53dbed
This commit is contained in:
android-build-team Robot
2018-05-03 15:37:15 -07:00
committed by android-build-merger
parent 8bef20f43b 8e4b8ea38a
commit f0f0746747
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -276,9 +276,16 @@ public class MessagingGroup extends LinearLayout implements MessagingLinearLayou
boolean hasNormal = false;
for (int i = mMessageContainer.getChildCount() - 1; i >= 0; i--) {
View child = mMessageContainer.getChildAt(i);
if (child.getVisibility() == GONE) {
continue;
}
if (child instanceof MessagingLinearLayout.MessagingChild) {
int type = ((MessagingLinearLayout.MessagingChild) child).getMeasuredType();
if (type == MEASURED_TOO_SMALL) {
boolean tooSmall = type == MEASURED_TOO_SMALL;
final MessagingLinearLayout.LayoutParams lp =
(MessagingLinearLayout.LayoutParams) child.getLayoutParams();
tooSmall |= lp.hide;
if (tooSmall) {
if (hasNormal) {
return MEASURED_SHORTENED;
} else {