[Catalog][FloatingToolbar] Fixed top app bar container fill

Resolves #4451

GIT_ORIGIN_REV_ID=f709d2c7743dd76f513414a02ad54da86cf51cb4
PiperOrigin-RevId: 705307074

Author: manabu-nakamura

catalog/java/io/material/catalog/floatingtoolbar/FloatingToolbarMainDemoFragment.java

@@ -21,6 +21,8 @@
 import android.graphics.Paint;
 import android.graphics.Typeface;
 import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -51,6 +53,9 @@ public View onCreateDemoView(
     View view = layoutInflater.inflate(getLayoutResId(), viewGroup, /* attachToRoot= */ false);
     TextView bodyText = view.findViewById(R.id.body_text);
 
+    Toolbar toolbar = view.findViewById(R.id.toolbar);
+    ((AppCompatActivity) requireActivity()).setSupportActionBar(toolbar);
+
     // Initialize group of floating toolbars.
     List<FloatingToolbarLayout> floatingToolbars =
         DemoUtils.findViewsWithType(view, FloatingToolbarLayout.class);
@@ -186,4 +191,9 @@ private int getRandomColor() {
   protected int getLayoutResId() {
     return R.layout.cat_floating_toolbar_fragment;
   }
+
+  @Override
+  public boolean shouldShowDefaultDemoActionBar() {
+    return false;
+  }
 }

catalog/java/io/material/catalog/floatingtoolbar/res/layout/cat_floating_toolbar_fragment.xml

@@ -17,12 +17,24 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:padding="8dp">
+  android:layout_height="match_parent">
+
+  <com.google.android.material.appbar.AppBarLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:fitsSystemWindows="true">
+    <androidx.appcompat.widget.Toolbar
+      style="?attr/catalogToolbarWithCloseButtonStyle"
+      android:id="@+id/toolbar"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      app:title="@string/cat_floating_toolbar_title"/>
+  </com.google.android.material.appbar.AppBarLayout>
 
   <androidx.core.widget.NestedScrollView
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
     <LinearLayout
       android:id="@+id/body_container"
       android:layout_width="match_parent"