From 0c23b72db58dd360eee57c8f1fa29e7923ca4ba5 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Guidez <plg@google.com>
Date: Mon, 11 Jul 2022 13:53:08 -0400
Subject: [PATCH 1/3] fix typo

---
 lib/l10n/intl_en.arb    | 2 +-
 lib/l10n/intl_en_US.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index 013aa24cc1..fec97b9322 100644
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -1431,7 +1431,7 @@
   "@demoCupertinoScrollbarTitle": {
     "description": "Title for the cupertino scrollbar demo."
   },
-  "demoCupertinoScrollbarSubtitle": "iOS style scrollbar",
+  "demoCupertinoScrollbarSubtitle": "iOS-style scrollbar",
   "@demoCupertinoScrollbarSubtitle": {
     "description": "Subtitle for the cupertino scrollbar demo."
   },
diff --git a/lib/l10n/intl_en_US.xml b/lib/l10n/intl_en_US.xml
index 84a8bdbb21..cfa8ca0b07 100644
--- a/lib/l10n/intl_en_US.xml
+++ b/lib/l10n/intl_en_US.xml
@@ -1324,7 +1324,7 @@
   <string
     name="demoCupertinoScrollbarSubtitle"
     description="Subtitle for the cupertino scrollbar demo."
-    >iOS style scrollbar</string>
+    >iOS-style scrollbar</string>
   <string
     name="demoCupertinoScrollbarDescription"
     description="Description for the cupertino scrollbar demo."

From 8199ccf44d24d4f95114b416272a7c8827a65135 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Guidez <plg@google.com>
Date: Mon, 11 Jul 2022 14:03:42 -0400
Subject: [PATCH 2/3] x

---
 lib/main.dart       | 6 ------
 lib/pages/home.dart | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index 10499e7c7e..8d034b2dd5 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -48,12 +48,6 @@ class GalleryApp extends StatelessWidget {
         builder: (context) {
           final options = GalleryOptions.of(context);
           return MaterialApp(
-            // By default on desktop, scrollbars are applied by the
-            // ScrollBehavior. This overrides that. All vertical scrollables in
-            // the gallery need to be audited before enabling this feature,
-            // see https://github.com/flutter/gallery/issues/523
-            scrollBehavior:
-                const MaterialScrollBehavior().copyWith(scrollbars: false),
             restorationScopeId: 'rootGallery',
             title: 'Flutter Gallery',
             debugShowCheckedModeBanner: false,
diff --git a/lib/pages/home.dart b/lib/pages/home.dart
index c02f9a690f..ad6068ffa2 100644
--- a/lib/pages/home.dart
+++ b/lib/pages/home.dart
@@ -532,6 +532,7 @@ class _DesktopCategoryItem extends StatelessWidget {
                 child: ListView.builder(
                   // Makes integration tests possible.
                   key: ValueKey('${category.name}DemoList'),
+                  primary: false,
                   itemBuilder: (context, index) =>
                       CategoryDemoItem(demo: demos[index]),
                   itemCount: demos.length,

From a67836bac62869c203f1c7869e44cbffb0d73976 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Guidez <plg@google.com>
Date: Mon, 11 Jul 2022 14:07:55 -0400
Subject: [PATCH 3/3] x

---
 lib/pages/home.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/pages/home.dart b/lib/pages/home.dart
index ad6068ffa2..5c260d558c 100644
--- a/lib/pages/home.dart
+++ b/lib/pages/home.dart
@@ -908,6 +908,7 @@ class _DesktopCarouselState extends State<_DesktopCarousel> {
               ),
               child: ListView.builder(
                 scrollDirection: Axis.horizontal,
+                primary: false,
                 physics: const _SnappingScrollPhysics(),
                 controller: _controller,
                 itemExtent: itemWidth,