commit 7cde2d7886d78555adc6c0953f41c307cd42d64a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jun 14 03:49:12 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jun 14 03:49:12 2024 +0000
tree b95320d37db018f30cd61330538d18550de36e12
parent 8ce3b7d4fe0df173b52c1c5c010e804b50a9996a
parent aed7ee362de85a7f769c0ddf892d1c073b1c9318

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27575916'] into 24Q2-release.

Change-Id: I0ebd0fe5825029ebd8d9fbb187faafdb8ac109f2

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

diff --git a/core/java/com/android/internal/widget/MessagingLinearLayout.java b/core/java/com/android/internal/widget/MessagingLinearLayout.java
index e07acac..87d3825 100644
--- a/core/java/com/android/internal/widget/MessagingLinearLayout.java
+++ b/core/java/com/android/internal/widget/MessagingLinearLayout.java
@@ -92,6 +92,8 @@
             final View child = getChildAt(i);
             final LayoutParams lp = (LayoutParams) child.getLayoutParams();
             lp.hide = true;
+            // Child always needs to be measured to calculate hide property correctly in onMeasure.
+            child.requestLayout();
             if (child instanceof MessagingChild) {
                 MessagingChild messagingChild = (MessagingChild) child;
                 // Whenever we encounter the message first, it's always first in the layout