[CollapsingToolbarLayout] Fixed incorrect title and subtitle positioning.

PiperOrigin-RevId: 712776905

Author: pekingme

catalog/java/io/material/catalog/topappbar/res/layout/cat_topappbar_collapsing_filled_action_fragment.xml

@@ -31,11 +31,9 @@
         style="?attr/collapsingToolbarLayoutMediumStyle"
         android:id="@+id/collapsingtoolbarlayout"
         android:layout_width="match_parent"
-        android:layout_height="?attr/collapsingToolbarLayoutMediumWithSubtitleSize"
+        android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
         app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
         app:expandedTitleGravity="bottom|center_horizontal"
-        app:title="@string/cat_topappbar_collapsing_demo_toolbar_medium_title"
-        app:subtitle="@string/cat_topappbar_collapsing_demo_toolbar_medium_subtitle"
         app:toolbarId="@id/toolbar">
       <LinearLayout
           android:layout_width="match_parent"
@@ -48,7 +46,9 @@
             android:layout_width="0dp"
             android:layout_height="?attr/actionBarSize"
             android:layout_weight="1"
-            android:elevation="0dp"/>
+            android:elevation="0dp"
+            app:title="@string/cat_topappbar_collapsing_demo_toolbar_medium_title"
+            app:subtitle="@string/cat_topappbar_collapsing_demo_toolbar_medium_subtitle" />
         <Button
             android:id="@+id/action_button"
             android:layout_width="wrap_content"

catalog/java/io/material/catalog/topappbar/res/layout/cat_topappbar_collapsing_large_with_subtitle_fragment.xml

@@ -31,19 +31,19 @@
         style="?attr/collapsingToolbarLayoutLargeStyle"
         android:id="@+id/collapsingtoolbarlayout"
         android:layout_width="match_parent"
-        android:layout_height="?attr/collapsingToolbarLayoutLargeWithSubtitleSize"
+        android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
         app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
-        app:expandedTitleGravity="bottom|center_horizontal"
-        app:title="@string/cat_topappbar_collapsing_demo_toolbar_large_title"
-        app:subtitle="@string/cat_topappbar_collapsing_demo_toolbar_large_subtitle">
+        app:expandedTitleGravity="bottom|center_horizontal">
 
       <androidx.appcompat.widget.Toolbar
           android:id="@+id/toolbar"
           style="?attr/catalogToolbarWithCloseButtonStyle"
           android:layout_width="match_parent"
           android:layout_height="?attr/actionBarSize"
           android:elevation="0dp"
-          app:layout_collapseMode="pin"/>
+          app:layout_collapseMode="pin"
+          app:title="@string/cat_topappbar_collapsing_demo_toolbar_large_title"
+          app:subtitle="@string/cat_topappbar_collapsing_demo_toolbar_large_subtitle" />
     </com.google.android.material.appbar.CollapsingToolbarLayout>
   </com.google.android.material.appbar.AppBarLayout>
 

catalog/java/io/material/catalog/topappbar/res/layout/cat_topappbar_collapsing_medium_with_subtitle_fragment.xml

@@ -31,19 +31,19 @@
         style="?attr/collapsingToolbarLayoutMediumStyle"
         android:id="@+id/collapsingtoolbarlayout"
         android:layout_width="match_parent"
-        android:layout_height="?attr/collapsingToolbarLayoutMediumWithSubtitleSize"
+        android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
         app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
-        app:expandedTitleGravity="bottom|center_horizontal"
-        app:title="@string/cat_topappbar_collapsing_demo_toolbar_medium_title"
-        app:subtitle="@string/cat_topappbar_collapsing_demo_toolbar_medium_subtitle">
+        app:expandedTitleGravity="bottom|center_horizontal">
 
       <androidx.appcompat.widget.Toolbar
           android:id="@+id/toolbar"
           style="?attr/catalogToolbarWithCloseButtonStyle"
           android:layout_width="match_parent"
           android:layout_height="?attr/actionBarSize"
           android:elevation="0dp"
-          app:layout_collapseMode="pin"/>
+          app:layout_collapseMode="pin"
+          app:title="@string/cat_topappbar_collapsing_demo_toolbar_medium_title"
+          app:subtitle="@string/cat_topappbar_collapsing_demo_toolbar_medium_subtitle" />
     </com.google.android.material.appbar.CollapsingToolbarLayout>
   </com.google.android.material.appbar.AppBarLayout>
 

catalog/java/io/material/catalog/topappbar/res/layout/cat_topappbar_collapsing_toggleable_action_fragment.xml

@@ -31,7 +31,7 @@
         style="?attr/collapsingToolbarLayoutMediumStyle"
         android:id="@+id/collapsingtoolbarlayout"
         android:layout_width="match_parent"
-        android:layout_height="?attr/collapsingToolbarLayoutMediumWithSubtitleSize"
+        android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
         app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
         app:expandedTitleGravity="bottom|center_horizontal"
         app:title="@string/cat_topappbar_collapsing_demo_toolbar_medium_title"

lib/java/com/google/android/material/appbar/CollapsingToolbarLayout.java

@@ -199,6 +199,8 @@ public class CollapsingToolbarLayout extends FrameLayout {
   private int extraMultilineHeight = 0;
   private boolean extraMultilineHeightEnabled;
 
+  private int extraHeightForTitles = 0;
+
   public CollapsingToolbarLayout(@NonNull Context context) {
     this(context, null);
   }
@@ -664,22 +666,48 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
       super.onMeasure(widthMeasureSpec, heightMeasureSpec);
     }
 
-    if (extraMultilineHeightEnabled && collapsingTitleHelper.getExpandedMaxLines() > 1) {
+    updateTitleFromToolbarIfNeeded();
+
+    if (collapsingTitleEnabled && !TextUtils.isEmpty(collapsingTitleHelper.getText())) {
+      final int originalHeight = getMeasuredHeight();
       // Need to update title and bounds in order to calculate line count and text height.
-      updateTitleFromToolbarIfNeeded();
-      updateTextBounds(0, 0, getMeasuredWidth(), getMeasuredHeight(), /* forceRecalculate= */ true);
-
-      int lineCount = collapsingTitleHelper.getExpandedLineCount();
-      if (lineCount > 1) {
-        // Add extra height based on the amount of height beyond the first line of title text.
-        int expandedTextHeight =
-            Math.round(collapsingTitleHelper.getExpandedTextFullSingleLineHeight());
-        extraMultilineHeight = expandedTextHeight * (lineCount - 1);
-        int newHeight = getMeasuredHeight() + extraMultilineHeight;
-        heightMeasureSpec = MeasureSpec.makeMeasureSpec(newHeight, MeasureSpec.EXACTLY);
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+      updateTextBounds(0, 0, getMeasuredWidth(), originalHeight, /* forceRecalculate= */ true);
+
+      // Calculates the extra height needed for the contents of the collapsing toolbar, if needed.
+      int expectedHeight =
+          (int)
+              (topInsetApplied
+                  + expandedMarginTop
+                  + collapsingTitleHelper.getExpandedTextFullSingleLineHeight()
+                  + (TextUtils.isEmpty(collapsingSubtitleHelper.getText())
+                      ? 0
+                      : expandedTitleSpacing
+                          + collapsingSubtitleHelper.getExpandedTextFullSingleLineHeight())
+                  + expandedMarginBottom);
+      if (expectedHeight > originalHeight) {
+        extraHeightForTitles = expectedHeight - originalHeight;
       } else {
-        extraMultilineHeight = 0;
+        extraHeightForTitles = 0;
+      }
+
+      // Calculates the extra height needed for the multiline title, if needed.
+      if (extraMultilineHeightEnabled && collapsingTitleHelper.getExpandedMaxLines() > 1) {
+        int lineCount = collapsingTitleHelper.getExpandedLineCount();
+        if (lineCount > 1) {
+          // Add extra height based on the amount of height beyond the first line of title text.
+          int expandedTextHeight =
+              Math.round(collapsingTitleHelper.getExpandedTextFullSingleLineHeight());
+          extraMultilineHeight = expandedTextHeight * (lineCount - 1);
+        } else {
+          extraMultilineHeight = 0;
+        }
+      }
+
+      if (extraHeightForTitles + extraMultilineHeight > 0) {
+        heightMeasureSpec =
+            MeasureSpec.makeMeasureSpec(
+                originalHeight + extraHeightForTitles + extraMultilineHeight, MeasureSpec.EXACTLY);
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
       }
     }
 
@@ -744,35 +772,37 @@ private void updateTextBounds(
         updateCollapsedBounds(isRtl);
 
         // Update the expanded bounds
+        final int titleBoundsLeft = isRtl ? expandedMarginEnd : expandedMarginStart;
+        final int titleBoundsTop = tmpRect.top + expandedMarginTop;
+        final int titleBoundsRight =
+            right - left - (isRtl ? expandedMarginStart : expandedMarginEnd);
+        final int titleBoundsBottom = bottom - top - expandedMarginBottom;
         if (TextUtils.isEmpty(collapsingSubtitleHelper.getText())) {
           collapsingTitleHelper.setExpandedBounds(
-              isRtl ? expandedMarginEnd : expandedMarginStart,
-              tmpRect.top + expandedMarginTop,
-              right - left - (isRtl ? expandedMarginStart : expandedMarginEnd),
-              bottom - top - expandedMarginBottom);
+              titleBoundsLeft, titleBoundsTop, titleBoundsRight, titleBoundsBottom);
 
           // Now recalculate using the new bounds
           collapsingTitleHelper.recalculate(forceRecalculate);
         } else {
           collapsingTitleHelper.setExpandedBounds(
-              isRtl ? expandedMarginEnd : expandedMarginStart,
-              tmpRect.top + expandedMarginTop,
-              right - left - (isRtl ? expandedMarginStart : expandedMarginEnd),
+              titleBoundsLeft,
+              titleBoundsTop,
+              titleBoundsRight,
               (int)
-                  (bottom
-                      - top
-                      - expandedMarginBottom
+                  (titleBoundsBottom
                       - collapsingSubtitleHelper.getExpandedTextFullSingleLineHeight()
-                      - expandedTitleSpacing));
+                      - expandedTitleSpacing),
+              /* alignBaselineAtBottom= */ false);
           collapsingSubtitleHelper.setExpandedBounds(
-              isRtl ? expandedMarginEnd : expandedMarginStart,
+              titleBoundsLeft,
               (int)
-                  (tmpRect.top
-                      + expandedMarginTop
-                      + collapsingTitleHelper.getExpandedTextFullSingleLineHeight()
+                  (titleBoundsTop
+                      + (collapsingTitleHelper.getExpandedTextFullSingleLineHeight()
+                          + extraMultilineHeight)
                       + expandedTitleSpacing),
-              right - left - (isRtl ? expandedMarginStart : expandedMarginEnd),
-              bottom - top - expandedMarginBottom);
+              titleBoundsRight,
+              titleBoundsBottom,
+              /* alignBaselineAtBottom= */ false);
 
           // Now recalculate using the new bounds
           collapsingTitleHelper.recalculate(forceRecalculate);
@@ -785,9 +815,15 @@ private void updateTextBounds(
   private void updateTitleFromToolbarIfNeeded() {
     if (toolbar != null) {
       if (collapsingTitleEnabled) {
-        if (TextUtils.isEmpty(collapsingTitleHelper.getText())) {
+        CharSequence title = getToolbarTitle(toolbar);
+        if (TextUtils.isEmpty(collapsingTitleHelper.getText()) && !TextUtils.isEmpty(title)) {
           // If we do not currently have a title, try and grab it from the Toolbar
-          setTitle(getToolbarTitle(toolbar));
+          setTitle(title);
+        }
+        CharSequence subtitle = getToolbarSubtitle(toolbar);
+        if (TextUtils.isEmpty(collapsingSubtitleHelper.getText()) && !TextUtils.isEmpty(subtitle)) {
+          // If we do not currently have a subtitle, try and grab it from the Toolbar
+          setSubtitle(subtitle);
         }
       }
     }
@@ -819,31 +855,24 @@ private void updateCollapsedBounds(boolean isRtl) {
       titleMarginTop = 0;
       titleMarginBottom = 0;
     }
+    final int titleBoundsLeft = tmpRect.left + (isRtl ? titleMarginEnd : titleMarginStart);
+    final int titleBoundsRight = tmpRect.right - (isRtl ? titleMarginStart : titleMarginEnd);
+    final int titleBoundsTop = tmpRect.top + maxOffset + titleMarginTop;
+    final int titleBoundsBottom = tmpRect.bottom + maxOffset - titleMarginBottom;
     if (TextUtils.isEmpty(collapsingSubtitleHelper.getText())) {
       collapsingTitleHelper.setCollapsedBounds(
-          tmpRect.left + (isRtl ? titleMarginEnd : titleMarginStart),
-          tmpRect.top + maxOffset + titleMarginTop,
-          tmpRect.right - (isRtl ? titleMarginStart : titleMarginEnd),
-          tmpRect.bottom + maxOffset - titleMarginBottom);
+          titleBoundsLeft, titleBoundsTop, titleBoundsRight, titleBoundsBottom);
     } else {
       collapsingTitleHelper.setCollapsedBounds(
-          tmpRect.left + (isRtl ? titleMarginEnd : titleMarginStart),
-          tmpRect.top + maxOffset + titleMarginTop,
-          tmpRect.right - (isRtl ? titleMarginStart : titleMarginEnd),
-          (int)
-              (tmpRect.bottom
-                  + maxOffset
-                  - titleMarginBottom
-                  - collapsingSubtitleHelper.getCollapsedFullSingleLineHeight()));
+          titleBoundsLeft,
+          titleBoundsTop,
+          titleBoundsRight,
+          (int) (titleBoundsBottom - collapsingSubtitleHelper.getCollapsedFullSingleLineHeight()));
       collapsingSubtitleHelper.setCollapsedBounds(
-          tmpRect.left + (isRtl ? titleMarginEnd : titleMarginStart),
-          (int)
-              (tmpRect.top
-                  + maxOffset
-                  + titleMarginTop
-                  + collapsingTitleHelper.getCollapsedFullSingleLineHeight()),
-          tmpRect.right - (isRtl ? titleMarginStart : titleMarginEnd),
-          tmpRect.bottom + maxOffset - titleMarginBottom);
+          titleBoundsLeft,
+          (int) (titleBoundsTop + collapsingTitleHelper.getCollapsedFullSingleLineHeight()),
+          titleBoundsRight,
+          titleBoundsBottom);
     }
   }
 
@@ -858,6 +887,17 @@ private static CharSequence getToolbarTitle(View view) {
     }
   }
 
+  @Nullable
+  private static CharSequence getToolbarSubtitle(View view) {
+    if (view instanceof androidx.appcompat.widget.Toolbar) {
+      return ((androidx.appcompat.widget.Toolbar) view).getSubtitle();
+    } else if (view instanceof android.widget.Toolbar) {
+      return ((android.widget.Toolbar) view).getSubtitle();
+    } else {
+      return null;
+    }
+  }
+
   private static int getHeightWithMargins(@NonNull final View view) {
     final ViewGroup.LayoutParams lp = view.getLayoutParams();
     if (lp instanceof MarginLayoutParams) {
@@ -1838,7 +1878,10 @@ public void setScrimVisibleHeightTrigger(@IntRange(from = 0) final int height) {
   public int getScrimVisibleHeightTrigger() {
     if (scrimVisibleHeightTrigger >= 0) {
       // If we have one explicitly set, return it
-      return scrimVisibleHeightTrigger + topInsetApplied + extraMultilineHeight;
+      return scrimVisibleHeightTrigger
+          + topInsetApplied
+          + extraMultilineHeight
+          + extraHeightForTitles;
     }
 
     // Otherwise we'll use the default computed value

lib/java/com/google/android/material/appbar/res-public/values/public.xml

@@ -20,9 +20,7 @@
   <public name="collapsingToolbarLayoutMediumStyle" type="attr"/>
   <public name="collapsingToolbarLayoutLargeStyle" type="attr"/>
   <public name="collapsingToolbarLayoutMediumSize" type="attr"/>
-  <public name="collapsingToolbarLayoutMediumWithSubtitleSize" type="attr"/>
   <public name="collapsingToolbarLayoutLargeSize" type="attr"/>
-  <public name="collapsingToolbarLayoutLargeWithSubtitleSize" type="attr"/>
   <public name="toolbarSurfaceStyle" type="attr"/>
   <public name="layout_scrollInterpolator" type="attr"/>
   <public name="layout_scrollEffect" type="attr"/>

lib/java/com/google/android/material/appbar/res/values/attrs.xml

@@ -31,15 +31,9 @@
   <!-- Size to use for Medium CollapsingToolbarLayouts in this theme. -->
   <attr name="collapsingToolbarLayoutMediumSize" format="reference"/>
 
-  <!-- Size to use for Medium CollapsingToolbarLayouts with subtitle in this theme. -->
-  <attr name="collapsingToolbarLayoutMediumWithSubtitleSize" format="reference"/>
-
   <!-- Size to use for Large CollapsingToolbarLayouts in this theme. -->
   <attr name="collapsingToolbarLayoutLargeSize" format="reference"/>
 
-  <!-- Size to use for Large CollapsingToolbarLayouts with subtitle in this theme. -->
-  <attr name="collapsingToolbarLayoutLargeWithSubtitleSize" format="reference"/>
-
   <!-- Style to use for Surface Toolbars in this theme. -->
   <attr name="toolbarSurfaceStyle" format="reference"/>
 

lib/java/com/google/android/material/dialog/res/values/themes_base.xml

@@ -178,9 +178,7 @@
 
     <!-- Top App Bars. -->
     <item name="collapsingToolbarLayoutMediumSize">@dimen/m3_appbar_size_medium</item>
-    <item name="collapsingToolbarLayoutMediumWithSubtitleSize">@dimen/m3_appbar_size_medium_with_subtitle</item>
     <item name="collapsingToolbarLayoutLargeSize">@dimen/m3_appbar_size_large</item>
-    <item name="collapsingToolbarLayoutLargeWithSubtitleSize">@dimen/m3_appbar_size_large_with_subtitle</item>
 
     <!-- Action Bars. -->
     <item name="actionBarPopupTheme">@style/ThemeOverlay.Material3.Light</item>
@@ -471,9 +469,7 @@
 
     <!-- Top App Bars. -->
     <item name="collapsingToolbarLayoutMediumSize">@dimen/m3_appbar_size_medium</item>
-    <item name="collapsingToolbarLayoutMediumWithSubtitleSize">@dimen/m3_appbar_size_medium_with_subtitle</item>
     <item name="collapsingToolbarLayoutLargeSize">@dimen/m3_appbar_size_large</item>
-    <item name="collapsingToolbarLayoutLargeWithSubtitleSize">@dimen/m3_appbar_size_large_with_subtitle</item>
 
     <!-- Action Bars. -->
     <item name="actionBarPopupTheme">@style/ThemeOverlay.Material3.Dark</item>