[FloatingToolbar] Fixed catalog formatting

PiperOrigin-RevId: 696355650

Author: afohrman

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

@@ -27,6 +27,7 @@
 import android.widget.TextView;
 import androidx.annotation.ColorInt;
 import androidx.annotation.IdRes;
+import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.material.button.MaterialButton;
@@ -47,10 +48,7 @@ public View onCreateDemoView(
       @Nullable ViewGroup viewGroup,
       @Nullable Bundle bundle) {
 
-    View view =
-        layoutInflater.inflate(
-            R.layout.cat_floating_toolbar_fragment, viewGroup, /* attachToRoot= */ false);
-
+    View view = layoutInflater.inflate(getLayoutResId(), viewGroup, /* attachToRoot= */ false);
     TextView bodyText = view.findViewById(R.id.body_text);
 
     // Initialize group of floating toolbars.
@@ -131,7 +129,8 @@ public View onCreateDemoView(
         view, floatingToolbars, R.id.bottom_button, R.id.floating_toolbar_bottom);
     initializeOrientationButton(
         view, floatingToolbars, R.id.left_button, R.id.floating_toolbar_left);
-    initializeOrientationButton(view, floatingToolbars, R.id.right_button, R.id.floating_toolbar_right);
+    initializeOrientationButton(
+        view, floatingToolbars, R.id.right_button, R.id.floating_toolbar_right);
 
     // Select bottom configuration button to represent the toolbar that's initially visible.
     view.findViewById(R.id.bottom_button).performClick();
@@ -182,4 +181,9 @@ private int getRandomColor() {
     final int bound = 256;
     return Color.rgb(random.nextInt(bound), random.nextInt(bound), random.nextInt(bound));
   }
+
+  @LayoutRes
+  protected int getLayoutResId() {
+    return R.layout.cat_floating_toolbar_fragment;
+  }
 }

lib/java/com/google/android/material/floatingtoolbar/res/values/styles.xml

@@ -30,9 +30,9 @@
        Note that layout_* attributes break when set via a default style. Always set this style
        explicitly on the layout to ensure that layout_* attributes are set properly. -->
   <style name="Widget.Material3.FloatingToolbar.Horizontal" parent="Base.Widget.Material3.FloatingToolbar">
+    <item name="android:layout_gravity">bottom|center</item>
     <item name="android:paddingStart">@dimen/m3_comp_toolbar_floating_container_leading_space</item>
     <item name="android:paddingEnd">@dimen/m3_comp_toolbar_floating_container_trailing_space</item>
-    <item name="android:layout_gravity">bottom|center</item>
   </style>
 
   <!-- Style for Vibrant color variation of the Horizontal Floating Toolbar.
@@ -47,9 +47,9 @@
        layout_* attributes break when set via a default style. Always set this style explicitly on
        the layout to ensure that layout_* attributes are set properly. -->
   <style name="Widget.Material3.FloatingToolbar.Vertical" parent="Base.Widget.Material3.FloatingToolbar">
+    <item name="android:layout_gravity">right|center</item>
     <item name="android:paddingTop">@dimen/m3_comp_toolbar_floating_container_leading_space</item>
     <item name="android:paddingBottom">@dimen/m3_comp_toolbar_floating_container_trailing_space</item>
-    <item name="android:layout_gravity">right|center</item>
   </style>
 
   <!-- Style for Vibrant color variation of the Vertical Floating Toolbar. Defaults to the right