material-components · pubiqq · Jan 23, 2024 · May 14, 2024
diff --git a/docs/components/BadgeDrawable.md b/docs/components/BadgeDrawable.md
@@ -9,7 +9,7 @@ path: /catalog/badging/
 
 # `BadgeDrawable`
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/badges/overview)
 *   [API reference](https://developer.android.com/reference/com/google/android/material/badge/package-summary)

diff --git a/docs/components/BottomAppBar.md b/docs/components/BottomAppBar.md
@@ -20,12 +20,12 @@ revert back to the previous style.
 
 **Contents**
 
-*   [Design & API documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-and-api-documentation)
 *   [Using bottom app bars](#using-bottom-app-bars)
 *   [Bottom app bar](#bottom-app-bar)
 *   [Theming bottom app bars](#theming-bottom-app-bars)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/bottom-app-bar/overview)
 *   [API Reference](https://developer.android.com/reference/com/google/android/material/bottomappbar/package-summary)
@@ -73,8 +73,8 @@ in the menu:
 
 ## Bottom app bar
 
-Bottom app bars provide access to a bottom navigation drawer and up to four
-actions, including the floating action button.
+Bottom app bars provide access to up to four actions, including the
+[floating action button](FloatingActionButton.md) (FAB).
 
 ### Bottom app bar examples
 

diff --git a/docs/components/BottomNavigation.md b/docs/components/BottomNavigation.md
@@ -16,12 +16,12 @@ allow movement between primary destinations in an app.
 
 **Contents**
 
-*   [Design & API documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-and-api-documentation)
 *   [Using bottom navigation](#using-bottom-navigation)
 *   [Bottom navigation bar](#bottom-navigation-bar)
 *   [Theming](#theming-a-bottom-navigation-bar)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/navigation-bar/overview)
 *   [API Reference](https://developer.android.com/reference/com/google/android/material/bottomnavigation/package-summary)

diff --git a/docs/components/BottomSheet.md b/docs/components/BottomSheet.md
@@ -16,15 +16,15 @@ containing supplementary content that are anchored to the bottom of the screen.
 
 **Contents**
 
-*   [Design & API Documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-and-api-documentation)
 *   [Using bottom sheets](#using-bottom-sheets)
 *   [Standard bottom sheet](#standard-bottom-sheet)
 *   [Modal bottom sheet](#modal-bottom-sheet)
 *   [Anatomy and key properties](#anatomy-and-key-properties)
 *   [Predictive Back](#predictive-back)
 *   [Theming](#theming-bottom-sheets)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/bottom-sheets/overview)
 *   [API Reference](https://developer.android.com/reference/com/google/android/material/bottomsheet/package-summary)

diff --git a/docs/components/Button.md b/docs/components/Button.md
@@ -16,7 +16,7 @@ and make choices, with a single tap.
 
 **Contents**
 
-*   [Design & API Documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-and-api-documentation)
 *   [Using buttons](#using-buttons)
 *   [Elevated button](#elevated-button)
 *   [Filled button](#filled-button)
@@ -27,7 +27,7 @@ and make choices, with a single tap.
 *   [Icon button](#icon-button)
 *   [Theming](#theming-buttons)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/buttons/overview)
 *   [API Reference](https://developer.android.com/reference/com/google/android/material/button/package-summary)
@@ -948,7 +948,7 @@ In the layout:
 />
 ```
 
-#### Styles & Theme attributes
+#### Styles and Theme attributes
 
 Element                      | Style                                             | Theme Attribute
 ---------------------------- | ------------------------------------------------- | ---------------

diff --git a/docs/components/Card.md b/docs/components/Card.md
@@ -16,12 +16,12 @@ a single subject.
 
 **Contents**
 
-*   [Design & API Documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-and-api-documentation)
 *   [Using cards](#using-cards)
 *   [Card](#card)
 *   [Theming](#theming-cards)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/cards/overview)
 *   [API reference](https://developer.android.com/reference/com/google/android/material/card/package-summary)

diff --git a/docs/components/Carousel.md b/docs/components/Carousel.md
@@ -15,15 +15,15 @@ Carousels contain a collection of items that can move into or out of view
 
 **Contents**
 
-*   [Design & API documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-and-api-documentation)
 *   [Using carousel](#using-carousel)
 *   [Multi-browse strategy](#multi-browse-strategy)
 *   [Hero strategy](#hero-strategy)
 *   [Fullscreen strategy](#fullscreen-strategy)
 *   [Attributes](#attributes)
 *   [Customizing carousel](#customizing-carousel)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/carousel/overview)
 *   [API reference](https://developer.android.com/reference/com/google/android/material/carousel/package-summary)

diff --git a/docs/components/Checkbox.md b/docs/components/Checkbox.md
@@ -24,12 +24,12 @@ checked](assets/checkbox/checkbox_hero.png)
 
 **Contents**
 
-*   [Design & API Documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-and-api-documentation)
 *   [Using checkboxes](#using-checkboxes)
 *   [Checkbox](#checkbox)
 *   [Theming checkboxes](#theming-checkboxes)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/checkbox/overview)
 *   [API reference](https://developer.android.com/reference/com/google/android/material/checkbox/package-summary)

diff --git a/docs/components/Chip.md b/docs/components/Chip.md
@@ -16,15 +16,15 @@ represent an input, attribute, or action.
 
 **Contents**
 
-*   [Design & API Documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-and-api-documentation)
 *   [Using chips](#using-chips)
 *   [Assist chip](#assist-chip)
 *   [Filter chip](#filter-chip)
 *   [Input chip](#input-chip)
 *   [Suggestion chip](#suggestion-chip)
 *   [Theming chips](#theming-chips)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/chips/overview)
 *   [API reference](https://developer.android.com/reference/com/google/android/material/chip/package-summary)

diff --git a/docs/components/DatePicker.md b/docs/components/DatePicker.md
@@ -16,12 +16,12 @@ date or range of dates.
 
 **Contents**
 
-*   [Design & API documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-and-api-documentation)
 *   [Using date pickers](#using-date-pickers)
 *   [Calendar date picker](#calendar-date-picker)
 *   [Theming date pickers](#theming-date-pickers)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/date-pickers/overview)
 *   [API reference](https://developer.android.com/reference/com/google/android/material/datepicker/package-summary)

diff --git a/docs/components/Dialog.md b/docs/components/Dialog.md
@@ -16,13 +16,13 @@ can contain critical information, require decisions, or involve multiple tasks.
 
 **Contents**
 
-*   [Design & API documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-and-api-documentation)
 *   [Using dialogs](#using-dialogs)
 *   [Basic dialog](#basic-dialog)
 *   [Full-screen dialog](#full-screen-dialog)
 *   [Theming](#theming-dialogs)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/date-pickers/overview)
 *   [API reference](https://developer.android.com/reference/com/google/android/material/dialog/package-summary)

diff --git a/docs/components/Divider.md b/docs/components/Divider.md
@@ -16,12 +16,12 @@ groups.
 
 **Contents**
 
-*   [Design & API Documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-and-api-documentation)
 *   [Using dividers](#using-dividers)
 *   [Divider's key properties](#key-properties)
 *   [Theming dividers](#theming-dividers)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/divider/overview)
 *   [API reference](https://developer.android.com/reference/com/google/android/material/divider/package-summary)

diff --git a/docs/components/FloatingActionButton.md b/docs/components/FloatingActionButton.md
@@ -17,15 +17,15 @@ represents the primary action of a screen.
 
 **Contents**
 
-*   [Design & API Documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-and-api-documentation)
 *   [Using FABs](#using-fabs)
 *   [FABs](#fabs)
 *   [Small FABs](#small-fabs)
 *   [Large FABs](#large-fabs)
 *   [Extended FABs](#extended-fabs)
 *   [Theming FABs](#theming-fabs)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/floating-action-button/overview)
 *   [API reference](https://developer.android.com/reference/com/google/android/material/floatingactionbutton/package-summary)

diff --git a/docs/components/MaterialTextView.md b/docs/components/MaterialTextView.md
@@ -15,7 +15,7 @@ A MaterialTextView is a derivative of AppCompatTextView that displays text to
 the user. To provide user-editable text, see
 [EditText](https://developer.android.com/reference/android/widget/EditText).
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   `MaterialTextView`
     *   [Class description](https://developer.android.com/reference/com/google/android/material/textview/MaterialTextView)

diff --git a/docs/components/Menu.md b/docs/components/Menu.md
@@ -16,13 +16,13 @@ temporary surfaces.
 
 **Contents**
 
-*   [Design & API Documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-and-api-documentation)
 *   [Using menus](#using-menus)
 *   [Dropdown menus](#dropdown-menus)
 *   [Exposed dropdown menus](#exposed-dropdown-menus)
 *   [Theming](#theming-menus)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/menus/overview)
 *   [API reference](https://developer.android.com/reference/android/view/Menu)

diff --git a/docs/components/NavigationDrawer.md b/docs/components/NavigationDrawer.md
@@ -16,16 +16,15 @@ access to destinations in your app.
 
 **Contents**
 
-*   [Design & API Documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-and-api-documentation)
 *   [Using navigation drawers](#using-navigation-drawers)
 *   [Anatomy](#anatomy)
 *   [Standard navigation drawer](#standard-navigation-drawer)
 *   [Modal navigation drawer](#modal-navigation-drawer)
-*   [Bottom navigation drawer](#bottom-navigation-drawer)
 *   [Predictive Back](#predictive-back)
 *   [Theming](#theming)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/navigation-drawer/overview)
 *   [API reference](https://developer.android.com/reference/com/google/android/material/navigation/package-summary)
@@ -344,10 +343,9 @@ Default style theme attribute: `?attr/drawerLayoutStyle`
 
 ### Types
 
-There are three types of navigation drawers: 1\.
-[Standard navigation drawer](#standard-navigation-drawer), 2\.
-[Modal navigation drawer](#modal-navigation-drawer), 3\.
-[Bottom navigation drawer](#bottom-navigation-drawer)
+There are two types of navigation drawers:
+- [Standard navigation drawer](#standard-navigation-drawer)
+- [Modal navigation drawer](#modal-navigation-drawer)
 
 ## Standard navigation drawer
 

diff --git a/docs/components/NavigationRail.md b/docs/components/NavigationRail.md
@@ -16,12 +16,12 @@ access to primary destinations in your app on tablet and desktop screens.
 
 **Contents**
 
-*   [Design & API Documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-and-api-documentation)
 *   [Using navigation rail](#using-navigation-rail)
 *   [Navigation rail example](#navigation-rail-example)
 *   [Theming](#theming-a-navigation-rail)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/navigation-rail/overview)
 *   [API Reference](https://developer.android.com/reference/com/google/android/material/navigationrail/package-summary)

diff --git a/docs/components/ProgressIndicator.md b/docs/components/ProgressIndicator.md
@@ -16,14 +16,14 @@ express an unspecified wait time or display the length of a process.
 
 **Contents**
 
-*   [Design & API Documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-and-api-documentation)
 *   [Using progress indicators](#using-progress-indicators)
 *   [Linear progress indicators](#linear-progress-indicators)
 *   [Circular progress indicators](#circular-progress-indicators)
 *   [Anatomy and key properties](#anatomy-and-key-properties)
 *   [Theming progress indicators](#theming-progress-indicators)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/progress-indicators/overview)
 *   [API Reference](https://developer.android.com/reference/com/google/android/material/progressindicator/package-summary)

diff --git a/docs/components/RadioButton.md b/docs/components/RadioButton.md
@@ -23,12 +23,12 @@ Use radio buttons to:
 
 **Contents**
 
-*   [Design & API Documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-and-api-documentation)
 *   [Using radio buttons](#using-radio-buttons)
 *   [Radio button](#radio-button)
 *   [Theming radio buttons](#theming-radio-buttons)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/radio-button/overview)
 *   [API Reference](https://developer.android.com/reference/com/google/android/material/radiobutton/package-summary)

diff --git a/docs/components/Search.md b/docs/components/Search.md
@@ -16,14 +16,14 @@ surface that allows product-specific branding and additional navigation icons.
 
 **Contents**
 
-*   [Design & API Documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-and-api-documentation)
 *   [Using search components](#using-search-components)
 *   [Search Bar](#search-bar)
 *   [Search View](#search-view)
 *   [Putting it all together](#putting-it-all-together)
 *   [Predictive Back](#predictive-back)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/search/overview)
 *   [API Reference](https://developer.android.com/reference/com/google/android/material/search/package-summary)
@@ -138,8 +138,7 @@ the scrolling view (usually a `RecyclerView` or `NestedScrollView`) in the
 scrolling view. This scrolling behavior makes the `AppBarLayout` transparent and
 not elevated so there are no undesirable shadows. It also adjusts the scrolling
 child so that the `SearchBar` will overlap the rest of your content and appear
-to be floating above it. See the [XML usage](#usage) section below for an
-example of how to set up this behavior.
+to be floating above it.
 
 Additionally, if your app is going edge-to-edge, consider adding
 `app:statusBarForeground="?attr/colorSurface"` to your `AppBarLayout` in order

diff --git a/docs/components/SideSheet.md b/docs/components/SideSheet.md
@@ -17,7 +17,7 @@ See [Bottom Sheet documentation](BottomSheet.md) for documentation about
 
 **Contents**
 
-*   [Design & API Documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-and-api-documentation)
 *   [Using side sheets](#using-side-sheets)
 *   [Standard side sheet](#standard-side-sheet)
 *   [Modal side sheet](#modal-side-sheet)
@@ -26,7 +26,7 @@ See [Bottom Sheet documentation](BottomSheet.md) for documentation about
 *   [Predictive Back](#predictive-back)
 *   [Theming](#theming-side-sheets)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/side-sheets/overview)
 *   [API Reference](https://developer.android.com/reference/com/google/android/material/sidesheet/package-summary)

diff --git a/docs/components/Slider.md b/docs/components/Slider.md
@@ -16,13 +16,13 @@ selections from a range of values.
 
 **Contents**
 
-*   [Design & API Documentation](#design-api-documentation)
+*   [Design and API Documentation](#design-api-documentation)
 *   [Using sliders](#using-sliders)
 *   [Continuous slider](#continuous-slider)
 *   [Discrete slider](#discrete-slider)
 *   [Theming sliders](#theming-sliders)
 
-## Design & API Documentation
+## Design and API Documentation
 
 *   [Google Material3 Spec](https://material.io/components/sliders/overview)
 *   [API Reference](https://developer.android.com/reference/com/google/android/material/slider/package-summary)