[CollapsingToolbarLayout] Fix issue where expanded text gets ellipsiz…

…ed too aggressively when using title fade mode and the toolbar has menu items PiperOrigin-RevId: 569287167
material-components · Oct 2, 2023 · 094e3e2 · 0MuTTanT0 · Jan 8, 2024 · 094e3e2
1 parent a01a68d
commit 094e3e2
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/catalog/java/io/material/catalog/topappbar/BaseTopAppBarCollapsingDemoFragment.java b/catalog/java/io/material/catalog/topappbar/BaseTopAppBarCollapsingDemoFragment.java
@@ -22,6 +22,8 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.LayoutRes;
@@ -32,6 +34,13 @@
 /** A base fragment that displays a collapsing Top App Bar demo for the Catalog app. */
 public abstract class BaseTopAppBarCollapsingDemoFragment extends DemoFragment {
 
+  @Override
+  public void onCreate(@Nullable Bundle bundle) {
+    super.onCreate(bundle);
+
+    setHasOptionsMenu(true);
+  }
+
   @NonNull
   @Override
   public View onCreateDemoView(
@@ -47,6 +56,13 @@ public View onCreateDemoView(
     return view;
   }
 
+  @Override
+  public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater menuInflater) {
+    super.onCreateOptionsMenu(menu, menuInflater);
+
+    menuInflater.inflate(R.menu.cat_topappbar_menu, menu);
+  }
+
   @Override
   public boolean shouldShowDefaultDemoActionBar() {
     return false;

diff --git a/...java/io/material/catalog/topappbar/res/layout/cat_topappbar_collapsing_large_fragment.xml b/...java/io/material/catalog/topappbar/res/layout/cat_topappbar_collapsing_large_fragment.xml
@@ -41,7 +41,7 @@
           android:layout_height="?attr/actionBarSize"
           android:elevation="0dp"
           app:layout_collapseMode="pin"
-          app:title="@string/cat_topappbar_collapsing_demo_toolbar_title"/>
+          app:title="@string/cat_topappbar_collapsing_demo_toolbar_large_title"/>
     </com.google.android.material.appbar.CollapsingToolbarLayout>
   </com.google.android.material.appbar.AppBarLayout>
 

diff --git a/...ava/io/material/catalog/topappbar/res/layout/cat_topappbar_collapsing_medium_fragment.xml b/...ava/io/material/catalog/topappbar/res/layout/cat_topappbar_collapsing_medium_fragment.xml
@@ -41,7 +41,7 @@
           android:layout_height="?attr/actionBarSize"
           android:elevation="0dp"
           app:layout_collapseMode="pin"
-          app:title="@string/cat_topappbar_collapsing_demo_toolbar_title"/>
+          app:title="@string/cat_topappbar_collapsing_demo_toolbar_medium_title"/>
     </com.google.android.material.appbar.CollapsingToolbarLayout>
   </com.google.android.material.appbar.AppBarLayout>
 

diff --git a/catalog/java/io/material/catalog/topappbar/res/values/strings.xml b/catalog/java/io/material/catalog/topappbar/res/values/strings.xml
@@ -41,8 +41,10 @@
   <string name="cat_topappbar_main_demo_toolbar_title">Regular Title</string>
   <!-- Title for the scrolling toolbar demo [CHAR_LIMIT=NONE] -->
   <string name="cat_topappbar_scrolling_demo_toolbar_title">Scrolling Title</string>
-  <!-- Title for the collpasing toolbar demo [CHAR_LIMIT=NONE] -->
-  <string name="cat_topappbar_collapsing_demo_toolbar_title">Collapsing Title</string>
+  <!-- Title for the medium collpasing toolbar demo [CHAR_LIMIT=NONE] -->
+  <string name="cat_topappbar_collapsing_demo_toolbar_medium_title">Collapsing Title Medium Size</string>
+  <!-- Title for the large collpasing toolbar demo [CHAR_LIMIT=NONE] -->
+  <string name="cat_topappbar_collapsing_demo_toolbar_large_title">Collapsing Title Large Size</string>
   <!-- Label for a button in the menu [CHAR_LIMIT=NONE] -->
   <string name="cat_topappbar_edit_menu_item_title">Edit</string>
   <!-- Label for a button in the menu [CHAR_LIMIT=NONE] -->

diff --git a/lib/java/com/google/android/material/internal/CollapsingTextHelper.java b/lib/java/com/google/android/material/internal/CollapsingTextHelper.java
@@ -1026,9 +1026,11 @@ private void calculateUsingTextSize(final float fraction, boolean forceRecalcula
       // collapsed text size
       float scaledDownWidth = expandedWidth * textSizeRatio;
 
-      if (forceRecalculate) {
+      if (forceRecalculate || fadeModeEnabled) {
         // If we're forcing a recalculate during a measure pass, use the expanded width since the
         // collapsed width might not be ready yet
+        // Or if the fade mode is enabled, we can also just use the expanded width because when
+        // fading out/in there is not a continuous scale transition between expanded/collapsed text
         availableWidth = expandedWidth;
       } else {
         // If the scaled down size is larger than the actual collapsed width, we need to