From 39cd9433d2a1068f958a0455f53ca564fd549238 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Fri, 25 May 2018 16:31:27 -0700
Subject: [PATCH 01/33] add semantic container, selectability, and enabled
 state to chip

---
 packages/flutter/lib/src/material/chip.dart | 109 ++++++++++----------
 1 file changed, 57 insertions(+), 52 deletions(-)

diff --git a/packages/flutter/lib/src/material/chip.dart b/packages/flutter/lib/src/material/chip.dart
index 721fbb8c29f3c..6caa9cca72942 100644
--- a/packages/flutter/lib/src/material/chip.dart
+++ b/packages/flutter/lib/src/material/chip.dart
@@ -1368,61 +1368,66 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
     final TextDirection textDirection = Directionality.of(context);
     final ShapeBorder shape = widget.shape ?? chipTheme.shape;
 
-    return new Material(
-      elevation: isTapping ? _kPressElevation : 0.0,
-      animationDuration: pressedAnimationDuration,
-      shape: shape,
-      child: new InkResponse(
-        onTap: canTap ? _handleTap : null,
-        onTapDown: canTap ? _handleTapDown : null,
-        onTapCancel: canTap ? _handleTapCancel : null,
-        child: new AnimatedBuilder(
-          animation: new Listenable.merge(<Listenable>[selectController, enableController]),
-          builder: (BuildContext context, Widget child) {
-            return new Container(
-              decoration: new ShapeDecoration(
-                shape: shape,
-                color: getBackgroundColor(chipTheme),
-              ),
-              child: child,
-            );
-          },
-          child: _wrapWithTooltip(
-            widget.tooltip,
-            widget.onPressed,
-            new _ChipRenderWidget(
-              theme: new _ChipRenderTheme(
-                label: new DefaultTextStyle(
-                  overflow: TextOverflow.fade,
-                  textAlign: TextAlign.start,
-                  maxLines: 1,
-                  softWrap: false,
-                  style: widget.labelStyle ?? chipTheme.labelStyle,
-                  child: widget.label,
-                ),
-                avatar: new AnimatedSwitcher(
-                  child: widget.avatar,
-                  duration: _kDrawerDuration,
-                  switchInCurve: Curves.fastOutSlowIn,
+    return new Semantics(
+      container: true,
+      selected: widget.selected,
+      enabled: widget.onPressed != null ? widget.isEnabled : null,
+      child: new Material(
+        elevation: isTapping ? _kPressElevation : 0.0,
+        animationDuration: pressedAnimationDuration,
+        shape: shape,
+        child: new InkResponse(
+          onTap: canTap ? _handleTap : null,
+          onTapDown: canTap ? _handleTapDown : null,
+          onTapCancel: canTap ? _handleTapCancel : null,
+          child: new AnimatedBuilder(
+            animation: new Listenable.merge(<Listenable>[selectController, enableController]),
+            builder: (BuildContext context, Widget child) {
+              return new Container(
+                decoration: new ShapeDecoration(
+                  shape: shape,
+                  color: getBackgroundColor(chipTheme),
                 ),
-                deleteIcon: new AnimatedSwitcher(
-                  child: _buildDeleteIcon(context, theme, chipTheme),
-                  duration: _kDrawerDuration,
-                  switchInCurve: Curves.fastOutSlowIn,
+                child: child,
+              );
+            },
+            child: _wrapWithTooltip(
+              widget.tooltip,
+              widget.onPressed,
+              new _ChipRenderWidget(
+                theme: new _ChipRenderTheme(
+                  label: new DefaultTextStyle(
+                    overflow: TextOverflow.fade,
+                    textAlign: TextAlign.start,
+                    maxLines: 1,
+                    softWrap: false,
+                    style: widget.labelStyle ?? chipTheme.labelStyle,
+                    child: widget.label,
+                  ),
+                  avatar: new AnimatedSwitcher(
+                    child: widget.avatar,
+                    duration: _kDrawerDuration,
+                    switchInCurve: Curves.fastOutSlowIn,
+                  ),
+                  deleteIcon: new AnimatedSwitcher(
+                    child: _buildDeleteIcon(context, theme, chipTheme),
+                    duration: _kDrawerDuration,
+                    switchInCurve: Curves.fastOutSlowIn,
+                  ),
+                  brightness: chipTheme.brightness,
+                  padding: (widget.padding ?? chipTheme.padding).resolve(textDirection),
+                  labelPadding: (widget.labelPadding ?? chipTheme.labelPadding).resolve(textDirection),
+                  showAvatar: hasAvatar,
+                  showCheckmark: widget.showCheckmark,
+                  canTapBody: canTap,
                 ),
-                brightness: chipTheme.brightness,
-                padding: (widget.padding ?? chipTheme.padding).resolve(textDirection),
-                labelPadding: (widget.labelPadding ?? chipTheme.labelPadding).resolve(textDirection),
-                showAvatar: hasAvatar,
-                showCheckmark: widget.showCheckmark,
-                canTapBody: canTap,
+                value: widget.selected,
+                checkmarkAnimation: checkmarkAnimation,
+                enableAnimation: enableAnimation,
+                avatarDrawerAnimation: avatarDrawerAnimation,
+                deleteDrawerAnimation: deleteDrawerAnimation,
+                isEnabled: widget.isEnabled,
               ),
-              value: widget.selected,
-              checkmarkAnimation: checkmarkAnimation,
-              enableAnimation: enableAnimation,
-              avatarDrawerAnimation: avatarDrawerAnimation,
-              deleteDrawerAnimation: deleteDrawerAnimation,
-              isEnabled: widget.isEnabled,
             ),
           ),
         ),

From cf8a1c398fe7ab9989e23f8b94e8f672f30f9377 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Fri, 25 May 2018 16:46:52 -0700
Subject: [PATCH 02/33] add tests for chip semantics

---
 packages/flutter/test/material/chip_test.dart | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/packages/flutter/test/material/chip_test.dart b/packages/flutter/test/material/chip_test.dart
index 02b33f7800838..46121fb713b84 100644
--- a/packages/flutter/test/material/chip_test.dart
+++ b/packages/flutter/test/material/chip_test.dart
@@ -4,11 +4,13 @@
 
 import 'dart:ui' show window;
 
+import 'package:flutter/semantics.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 
 import '../rendering/mock_canvas.dart';
+import '../widgets/semantics_tester.dart';
 import 'feedback_tester.dart';
 
 Finder findRenderChipElement() {
@@ -1145,4 +1147,73 @@ void main() {
     expect(materialBox, paints..path(color: customTheme.disabledColor));
     expect(labelStyle.style.color, equals(Colors.black.withAlpha(0xde)));
   });
+
+  testWidgets('Chip semantics', (WidgetTester tester) async {
+    final SemanticsTester semanticsTester = new SemanticsTester(tester);
+
+    await tester.pumpWidget(new MaterialApp(
+      home: const Material(
+        child: const Chip(
+          label: const Text('test'),
+        ),
+      ),
+    ));
+
+    expect(semanticsTester, hasSemantics(
+      new TestSemantics.root(
+        children: <TestSemantics>[
+          new TestSemantics(
+            textDirection: TextDirection.ltr,
+            children: <TestSemantics>[
+              new TestSemantics(
+                flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
+                children: <TestSemantics>[
+                  new TestSemantics(
+                    label: 'test',
+                    textDirection: TextDirection.ltr,
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ],
+      ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+
+    await tester.pumpWidget(new MaterialApp(
+      home: new Material(
+        child: new InputChip(
+          isEnabled: true,
+          label: const Text('test'),
+          onPressed: () {},
+        ),
+      ),
+    ));
+
+    expect(semanticsTester, hasSemantics(
+        new TestSemantics.root(
+          children: <TestSemantics>[
+            new TestSemantics(
+              textDirection: TextDirection.ltr,
+              children: <TestSemantics>[
+                new TestSemantics(
+                  flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
+                  children: <TestSemantics>[
+                    new TestSemantics(
+                      label: 'test',
+                      textDirection: TextDirection.ltr,
+                      flags: <SemanticsFlag>[
+                        SemanticsFlag.hasEnabledState,
+                        SemanticsFlag.isEnabled,
+                      ],
+                      actions: <SemanticsAction>[SemanticsAction.tap],
+                    ),
+                  ],
+                ),
+              ],
+            ),
+          ],
+        ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+
+    semanticsTester.dispose();
+  });
 }

From 42402a187d29b9ca25b07008411c51aeb9d824ab Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Tue, 29 May 2018 15:50:44 -0700
Subject: [PATCH 03/33] add more test coverage, make sure hasEnabledState is
 present

---
 packages/flutter/lib/src/material/chip.dart   |   2 +-
 packages/flutter/test/material/chip_test.dart | 185 +++++++++++++++---
 2 files changed, 160 insertions(+), 27 deletions(-)

diff --git a/packages/flutter/lib/src/material/chip.dart b/packages/flutter/lib/src/material/chip.dart
index 6caa9cca72942..4bed9f32bfbcb 100644
--- a/packages/flutter/lib/src/material/chip.dart
+++ b/packages/flutter/lib/src/material/chip.dart
@@ -1371,7 +1371,7 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
     return new Semantics(
       container: true,
       selected: widget.selected,
-      enabled: widget.onPressed != null ? widget.isEnabled : null,
+      enabled: (widget.onPressed != null || widget.onSelected != null) ? widget.isEnabled : null,
       child: new Material(
         elevation: isTapping ? _kPressElevation : 0.0,
         animationDuration: pressedAnimationDuration,
diff --git a/packages/flutter/test/material/chip_test.dart b/packages/flutter/test/material/chip_test.dart
index 46121fb713b84..5d3c1c29b7408 100644
--- a/packages/flutter/test/material/chip_test.dart
+++ b/packages/flutter/test/material/chip_test.dart
@@ -1148,17 +1148,99 @@ void main() {
     expect(labelStyle.style.color, equals(Colors.black.withAlpha(0xde)));
   });
 
-  testWidgets('Chip semantics', (WidgetTester tester) async {
+  testWidgets('Chip semantics - default', (WidgetTester tester) async {
     final SemanticsTester semanticsTester = new SemanticsTester(tester);
 
     await tester.pumpWidget(new MaterialApp(
       home: const Material(
-        child: const Chip(
+        child: const RawChip(
           label: const Text('test'),
         ),
       ),
     ));
 
+    expect(semanticsTester, hasSemantics(
+        new TestSemantics.root(
+          children: <TestSemantics>[
+            new TestSemantics(
+              textDirection: TextDirection.ltr,
+              children: <TestSemantics>[
+                new TestSemantics(
+                  flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
+                  children: <TestSemantics>[
+                    new TestSemantics(
+                      label: 'test',
+                      textDirection: TextDirection.ltr,
+                    ),
+                  ],
+                ),
+              ],
+            ),
+          ],
+        ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+    semanticsTester.dispose();
+  });
+
+  testWidgets('Chip semantics - InputChip', (WidgetTester tester) async {
+    final SemanticsTester semanticsTester = new SemanticsTester(tester);
+
+    await tester.pumpWidget(new MaterialApp(
+      home: new Material(
+        child: new RawChip(
+          isEnabled: true,
+          label: const Text('test'),
+          onPressed: () {},
+        ),
+      ),
+    ));
+
+    expect(semanticsTester, hasSemantics(
+      new TestSemantics.root(
+        children: <TestSemantics>[
+          new TestSemantics(
+            textDirection: TextDirection.ltr,
+            children: <TestSemantics>[
+              new TestSemantics(
+                flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
+                children: <TestSemantics>[
+                  new TestSemantics(
+                    label: 'test',
+                    textDirection: TextDirection.ltr,
+                    flags: <SemanticsFlag>[
+                      SemanticsFlag.hasEnabledState,
+                      SemanticsFlag.isEnabled,
+                    ],
+                    actions: <SemanticsAction>[SemanticsAction.tap],
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ],
+      ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+
+
+    semanticsTester.dispose();
+  });
+
+
+  testWidgets('Chip semantics - Selectable', (WidgetTester tester) async {
+    final SemanticsTester semanticsTester = new SemanticsTester(tester);
+    bool selected = false;
+
+    await tester.pumpWidget(new MaterialApp(
+      home: new Material(
+        child: new RawChip(
+          isEnabled: true,
+          label: const Text('test'),
+          selected: selected,
+          onSelected: (bool value) {
+            selected = value;
+          },
+        ),
+      ),
+    ));
+
     expect(semanticsTester, hasSemantics(
       new TestSemantics.root(
         children: <TestSemantics>[
@@ -1171,6 +1253,11 @@ void main() {
                   new TestSemantics(
                     label: 'test',
                     textDirection: TextDirection.ltr,
+                    flags: <SemanticsFlag>[
+                      SemanticsFlag.hasEnabledState,
+                      SemanticsFlag.isEnabled,
+                    ],
+                    actions: <SemanticsAction>[SemanticsAction.tap],
                   ),
                 ],
               ),
@@ -1179,40 +1266,86 @@ void main() {
         ],
       ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
 
+    await tester.tap(find.byType(RawChip));
     await tester.pumpWidget(new MaterialApp(
       home: new Material(
-        child: new InputChip(
+        child: new RawChip(
           isEnabled: true,
           label: const Text('test'),
+          selected: selected,
+          onSelected: (bool value) {
+            selected = value;
+          },
+        ),
+      ),
+    ));
+
+    expect(selected, true);
+    expect(semanticsTester, hasSemantics(
+      new TestSemantics.root(
+        children: <TestSemantics>[
+          new TestSemantics(
+            textDirection: TextDirection.ltr,
+            children: <TestSemantics>[
+              new TestSemantics(
+                flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
+                children: <TestSemantics>[
+                  new TestSemantics(
+                    label: 'test',
+                    textDirection: TextDirection.ltr,
+                    flags: <SemanticsFlag>[
+                      SemanticsFlag.isSelected,
+                      SemanticsFlag.hasEnabledState,
+                      SemanticsFlag.isEnabled,
+                    ],
+                    actions: <SemanticsAction>[SemanticsAction.tap],
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ],
+      ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+
+    semanticsTester.dispose();
+  });
+
+  testWidgets('Chip semantics - Enableable', (WidgetTester tester) async {
+    final SemanticsTester semanticsTester = new SemanticsTester(tester);
+
+    await tester.pumpWidget(new MaterialApp(
+      home: new Material(
+        child: new RawChip(
+          isEnabled: false,
           onPressed: () {},
+          label: const Text('test'),
         ),
       ),
     ));
 
     expect(semanticsTester, hasSemantics(
-        new TestSemantics.root(
-          children: <TestSemantics>[
-            new TestSemantics(
-              textDirection: TextDirection.ltr,
-              children: <TestSemantics>[
-                new TestSemantics(
-                  flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
-                  children: <TestSemantics>[
-                    new TestSemantics(
-                      label: 'test',
-                      textDirection: TextDirection.ltr,
-                      flags: <SemanticsFlag>[
-                        SemanticsFlag.hasEnabledState,
-                        SemanticsFlag.isEnabled,
-                      ],
-                      actions: <SemanticsAction>[SemanticsAction.tap],
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ],
-        ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+      new TestSemantics.root(
+        children: <TestSemantics>[
+          new TestSemantics(
+            textDirection: TextDirection.ltr,
+            children: <TestSemantics>[
+              new TestSemantics(
+                flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
+                children: <TestSemantics>[
+                  new TestSemantics(
+                    label: 'test',
+                    textDirection: TextDirection.ltr,
+                    flags: <SemanticsFlag>[
+                      SemanticsFlag.hasEnabledState,
+                    ],
+                    actions: <SemanticsAction>[],
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ],
+      ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
 
     semanticsTester.dispose();
   });

From be5801f5434589191163560181ea05eb89b028f1 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Tue, 29 May 2018 16:52:55 -0700
Subject: [PATCH 04/33] update tests and use canTap

---
 packages/flutter/lib/src/material/chip.dart   |   2 +-
 packages/flutter/test/material/chip_test.dart | 288 +++++++++---------
 2 files changed, 144 insertions(+), 146 deletions(-)

diff --git a/packages/flutter/lib/src/material/chip.dart b/packages/flutter/lib/src/material/chip.dart
index 4bed9f32bfbcb..e84abdd218f0a 100644
--- a/packages/flutter/lib/src/material/chip.dart
+++ b/packages/flutter/lib/src/material/chip.dart
@@ -1371,7 +1371,7 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
     return new Semantics(
       container: true,
       selected: widget.selected,
-      enabled: (widget.onPressed != null || widget.onSelected != null) ? widget.isEnabled : null,
+      enabled: canTap ? widget.isEnabled : null,
       child: new Material(
         elevation: isTapping ? _kPressElevation : 0.0,
         animationDuration: pressedAnimationDuration,
diff --git a/packages/flutter/test/material/chip_test.dart b/packages/flutter/test/material/chip_test.dart
index 5d3c1c29b7408..6df665f0164c5 100644
--- a/packages/flutter/test/material/chip_test.dart
+++ b/packages/flutter/test/material/chip_test.dart
@@ -1148,205 +1148,203 @@ void main() {
     expect(labelStyle.style.color, equals(Colors.black.withAlpha(0xde)));
   });
 
-  testWidgets('Chip semantics - default', (WidgetTester tester) async {
-    final SemanticsTester semanticsTester = new SemanticsTester(tester);
-
-    await tester.pumpWidget(new MaterialApp(
-      home: const Material(
-        child: const RawChip(
-          label: const Text('test'),
-        ),
-      ),
-    ));
-
-    expect(semanticsTester, hasSemantics(
-        new TestSemantics.root(
-          children: <TestSemantics>[
-            new TestSemantics(
-              textDirection: TextDirection.ltr,
-              children: <TestSemantics>[
-                new TestSemantics(
-                  flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
-                  children: <TestSemantics>[
-                    new TestSemantics(
-                      label: 'test',
-                      textDirection: TextDirection.ltr,
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ],
-        ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
-    semanticsTester.dispose();
-  });
-
-  testWidgets('Chip semantics - InputChip', (WidgetTester tester) async {
-    final SemanticsTester semanticsTester = new SemanticsTester(tester);
-
-    await tester.pumpWidget(new MaterialApp(
-      home: new Material(
-        child: new RawChip(
-          isEnabled: true,
-          label: const Text('test'),
-          onPressed: () {},
+  group('Chip semantics', () {
+    testWidgets('label only', (WidgetTester tester) async {
+      final SemanticsTester semanticsTester = new SemanticsTester(tester);
+
+      await tester.pumpWidget(new MaterialApp(
+        home: const Material(
+          child: const RawChip(
+            label: const Text('test'),
+          ),
         ),
-      ),
-    ));
+      ));
 
-    expect(semanticsTester, hasSemantics(
-      new TestSemantics.root(
-        children: <TestSemantics>[
-          new TestSemantics(
-            textDirection: TextDirection.ltr,
+      expect(semanticsTester, hasSemantics(
+          new TestSemantics.root(
             children: <TestSemantics>[
               new TestSemantics(
-                flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
+                textDirection: TextDirection.ltr,
                 children: <TestSemantics>[
                   new TestSemantics(
-                    label: 'test',
-                    textDirection: TextDirection.ltr,
-                    flags: <SemanticsFlag>[
-                      SemanticsFlag.hasEnabledState,
-                      SemanticsFlag.isEnabled,
+                    flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
+                    children: <TestSemantics>[
+                      new TestSemantics(
+                        label: 'test',
+                        textDirection: TextDirection.ltr,
+                      ),
                     ],
-                    actions: <SemanticsAction>[SemanticsAction.tap],
                   ),
                 ],
               ),
             ],
+          ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+      semanticsTester.dispose();
+    });
+
+    testWidgets('with onPressed', (WidgetTester tester) async {
+      final SemanticsTester semanticsTester = new SemanticsTester(tester);
+
+      await tester.pumpWidget(new MaterialApp(
+        home: new Material(
+          child: new RawChip(
+            label: const Text('test'),
+            onPressed: () {},
           ),
-        ],
-      ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+        ),
+      ));
 
+      expect(semanticsTester, hasSemantics(
+          new TestSemantics.root(
+            children: <TestSemantics>[
+              new TestSemantics(
+                textDirection: TextDirection.ltr,
+                children: <TestSemantics>[
+                  new TestSemantics(
+                    flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
+                    children: <TestSemantics>[
+                      new TestSemantics(
+                        label: 'test',
+                        textDirection: TextDirection.ltr,
+                        flags: <SemanticsFlag>[
+                          SemanticsFlag.hasEnabledState,
+                          SemanticsFlag.isEnabled,
+                        ],
+                        actions: <SemanticsAction>[SemanticsAction.tap],
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            ],
+          ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
 
-    semanticsTester.dispose();
-  });
+      semanticsTester.dispose();
+    });
 
 
-  testWidgets('Chip semantics - Selectable', (WidgetTester tester) async {
-    final SemanticsTester semanticsTester = new SemanticsTester(tester);
-    bool selected = false;
+    testWidgets('with onSelected', (WidgetTester tester) async {
+      final SemanticsTester semanticsTester = new SemanticsTester(tester);
+      bool selected = false;
 
-    await tester.pumpWidget(new MaterialApp(
-      home: new Material(
-        child: new RawChip(
-          isEnabled: true,
-          label: const Text('test'),
-          selected: selected,
-          onSelected: (bool value) {
-            selected = value;
-          },
+      await tester.pumpWidget(new MaterialApp(
+        home: new Material(
+          child: new RawChip(
+            isEnabled: true,
+            label: const Text('test'),
+            selected: selected,
+            onSelected: (bool value) {
+              selected = value;
+            },
+          ),
         ),
-      ),
-    ));
+      ));
 
-    expect(semanticsTester, hasSemantics(
-      new TestSemantics.root(
-        children: <TestSemantics>[
-          new TestSemantics(
-            textDirection: TextDirection.ltr,
+      expect(semanticsTester, hasSemantics(
+          new TestSemantics.root(
             children: <TestSemantics>[
               new TestSemantics(
-                flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
+                textDirection: TextDirection.ltr,
                 children: <TestSemantics>[
                   new TestSemantics(
-                    label: 'test',
-                    textDirection: TextDirection.ltr,
-                    flags: <SemanticsFlag>[
-                      SemanticsFlag.hasEnabledState,
-                      SemanticsFlag.isEnabled,
+                    flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
+                    children: <TestSemantics>[
+                      new TestSemantics(
+                        label: 'test',
+                        textDirection: TextDirection.ltr,
+                        flags: <SemanticsFlag>[
+                          SemanticsFlag.hasEnabledState,
+                          SemanticsFlag.isEnabled,
+                        ],
+                        actions: <SemanticsAction>[SemanticsAction.tap],
+                      ),
                     ],
-                    actions: <SemanticsAction>[SemanticsAction.tap],
                   ),
                 ],
               ),
             ],
+          ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+
+      await tester.tap(find.byType(RawChip));
+      await tester.pumpWidget(new MaterialApp(
+        home: new Material(
+          child: new RawChip(
+            isEnabled: true,
+            label: const Text('test'),
+            selected: selected,
+            onSelected: (bool value) {
+              selected = value;
+            },
           ),
-        ],
-      ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
-
-    await tester.tap(find.byType(RawChip));
-    await tester.pumpWidget(new MaterialApp(
-      home: new Material(
-        child: new RawChip(
-          isEnabled: true,
-          label: const Text('test'),
-          selected: selected,
-          onSelected: (bool value) {
-            selected = value;
-          },
         ),
-      ),
-    ));
+      ));
 
-    expect(selected, true);
-    expect(semanticsTester, hasSemantics(
-      new TestSemantics.root(
-        children: <TestSemantics>[
-          new TestSemantics(
-            textDirection: TextDirection.ltr,
+      expect(selected, true);
+      expect(semanticsTester, hasSemantics(
+          new TestSemantics.root(
             children: <TestSemantics>[
               new TestSemantics(
-                flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
+                textDirection: TextDirection.ltr,
                 children: <TestSemantics>[
                   new TestSemantics(
-                    label: 'test',
-                    textDirection: TextDirection.ltr,
-                    flags: <SemanticsFlag>[
-                      SemanticsFlag.isSelected,
-                      SemanticsFlag.hasEnabledState,
-                      SemanticsFlag.isEnabled,
+                    flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
+                    children: <TestSemantics>[
+                      new TestSemantics(
+                        label: 'test',
+                        textDirection: TextDirection.ltr,
+                        flags: <SemanticsFlag>[
+                          SemanticsFlag.isSelected,
+                          SemanticsFlag.hasEnabledState,
+                          SemanticsFlag.isEnabled,
+                        ],
+                        actions: <SemanticsAction>[SemanticsAction.tap],
+                      ),
                     ],
-                    actions: <SemanticsAction>[SemanticsAction.tap],
                   ),
                 ],
               ),
             ],
-          ),
-        ],
-      ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+          ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
 
-    semanticsTester.dispose();
-  });
+      semanticsTester.dispose();
+    });
 
-  testWidgets('Chip semantics - Enableable', (WidgetTester tester) async {
-    final SemanticsTester semanticsTester = new SemanticsTester(tester);
+    testWidgets('disabled', (WidgetTester tester) async {
+      final SemanticsTester semanticsTester = new SemanticsTester(tester);
 
-    await tester.pumpWidget(new MaterialApp(
-      home: new Material(
-        child: new RawChip(
-          isEnabled: false,
-          onPressed: () {},
-          label: const Text('test'),
+      await tester.pumpWidget(new MaterialApp(
+        home: new Material(
+          child: new RawChip(
+            isEnabled: false,
+            onPressed: () {},
+            label: const Text('test'),
+          ),
         ),
-      ),
-    ));
+      ));
 
-    expect(semanticsTester, hasSemantics(
-      new TestSemantics.root(
-        children: <TestSemantics>[
-          new TestSemantics(
-            textDirection: TextDirection.ltr,
+      expect(semanticsTester, hasSemantics(
+          new TestSemantics.root(
             children: <TestSemantics>[
               new TestSemantics(
-                flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
+                textDirection: TextDirection.ltr,
                 children: <TestSemantics>[
                   new TestSemantics(
-                    label: 'test',
-                    textDirection: TextDirection.ltr,
-                    flags: <SemanticsFlag>[
-                      SemanticsFlag.hasEnabledState,
+                    flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
+                    children: <TestSemantics>[
+                      new TestSemantics(
+                        label: 'test',
+                        textDirection: TextDirection.ltr,
+                        flags: <SemanticsFlag>[],
+                        actions: <SemanticsAction>[],
+                      ),
                     ],
-                    actions: <SemanticsAction>[],
                   ),
                 ],
               ),
             ],
-          ),
-        ],
-      ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+          ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
 
-    semanticsTester.dispose();
+      semanticsTester.dispose();
+    });
   });
 }

From ef41d7fcff353a381c3a18ee4e719b930e5c4b9a Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Wed, 30 May 2018 15:20:29 -0700
Subject: [PATCH 05/33] increase tap target using outer padding

---
 packages/flutter/lib/src/material/flat_button.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/flutter/lib/src/material/flat_button.dart b/packages/flutter/lib/src/material/flat_button.dart
index ee002ab8e028b..f33ea5154f59f 100644
--- a/packages/flutter/lib/src/material/flat_button.dart
+++ b/packages/flutter/lib/src/material/flat_button.dart
@@ -290,6 +290,7 @@ class FlatButton extends StatelessWidget {
       splashColor: _getSplashColor(theme, buttonTheme),
       elevation: 0.0,
       highlightElevation: 0.0,
+      outerPadding: const EdgeInsets.only(top: 6.0, bottom: 6.0),
       padding: padding ?? buttonTheme.padding,
       constraints: buttonTheme.constraints,
       shape: shape ?? buttonTheme.shape,

From 2a9a87e4d163af8075fe4d399ab2b4e8b268d723 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Wed, 30 May 2018 17:39:48 -0700
Subject: [PATCH 06/33] changed outer padding to outer constraints, update some
 tests

---
 packages/flutter/lib/src/material/button.dart | 24 +++++++++++--------
 .../flutter/lib/src/material/flat_button.dart |  2 +-
 .../src/material/floating_action_button.dart  |  2 +-
 .../flutter/test/material/buttons_test.dart   | 10 ++++----
 .../material/raw_material_button_test.dart    | 10 ++++----
 .../flutter/test/material/scaffold_test.dart  |  2 +-
 .../flutter/test/material/snack_bar_test.dart |  8 +++----
 7 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/packages/flutter/lib/src/material/button.dart b/packages/flutter/lib/src/material/button.dart
index 0c3a5fb49e6ca..d7298216d4a45 100644
--- a/packages/flutter/lib/src/material/button.dart
+++ b/packages/flutter/lib/src/material/button.dart
@@ -38,7 +38,7 @@ class RawMaterialButton extends StatefulWidget {
     this.elevation: 2.0,
     this.highlightElevation: 8.0,
     this.disabledElevation: 0.0,
-    this.outerPadding,
+    this.outerConstraints,
     this.padding: EdgeInsets.zero,
     this.constraints: const BoxConstraints(minWidth: 88.0, minHeight: 36.0),
     this.shape: const RoundedRectangleBorder(),
@@ -60,7 +60,7 @@ class RawMaterialButton extends StatefulWidget {
 
   /// Padding to increase the size of the gesture detector which doesn't
   /// increase the visible material of the button.
-  final EdgeInsets outerPadding;
+  final BoxConstraints outerConstraints;
 
   /// Called by the underlying [InkWell] widget's [InkWell.onHighlightChanged]
   /// callback.
@@ -187,14 +187,18 @@ class _RawMaterialButtonState extends State<RawMaterialButton> {
       ),
     );
 
-    if (widget.outerPadding != null) {
-      result = new GestureDetector(
-        behavior: HitTestBehavior.translucent,
-        excludeFromSemantics: true,
-        onTap: widget.onPressed,
-        child: new Padding(
-          padding: widget.outerPadding,
-          child: result
+    if (widget.outerConstraints != null) {
+      result = new ConstrainedBox(
+        constraints: widget.outerConstraints,
+        child: new GestureDetector(
+          behavior: HitTestBehavior.translucent,
+          excludeFromSemantics: true,
+          onTap: widget.onPressed,
+          child: new Center(
+            child: result,
+            widthFactor: 1.0,
+            heightFactor: 1.0,
+          ),
         ),
       );
     }
diff --git a/packages/flutter/lib/src/material/flat_button.dart b/packages/flutter/lib/src/material/flat_button.dart
index f33ea5154f59f..614e4cb7d6e15 100644
--- a/packages/flutter/lib/src/material/flat_button.dart
+++ b/packages/flutter/lib/src/material/flat_button.dart
@@ -290,7 +290,7 @@ class FlatButton extends StatelessWidget {
       splashColor: _getSplashColor(theme, buttonTheme),
       elevation: 0.0,
       highlightElevation: 0.0,
-      outerPadding: const EdgeInsets.only(top: 6.0, bottom: 6.0),
+      outerConstraints: const BoxConstraints(minHeight: 48.0),
       padding: padding ?? buttonTheme.padding,
       constraints: buttonTheme.constraints,
       shape: shape ?? buttonTheme.shape,
diff --git a/packages/flutter/lib/src/material/floating_action_button.dart b/packages/flutter/lib/src/material/floating_action_button.dart
index 236192a5f9789..3a37f977012aa 100644
--- a/packages/flutter/lib/src/material/floating_action_button.dart
+++ b/packages/flutter/lib/src/material/floating_action_button.dart
@@ -268,7 +268,7 @@ class _FloatingActionButtonState extends State<FloatingActionButton> {
       onHighlightChanged: _handleHighlightChanged,
       elevation: _highlight ? widget.highlightElevation : widget.elevation,
       constraints: widget._sizeConstraints,
-      outerPadding: widget.mini ? const EdgeInsets.all(4.0) : null,
+      outerConstraints: widget.mini ? const BoxConstraints(minHeight: 48.0, minWidth: 48.0) : null,
       fillColor: widget.backgroundColor ?? theme.accentColor,
       textStyle: theme.accentTextTheme.button.copyWith(
         color: foregroundColor,
diff --git a/packages/flutter/test/material/buttons_test.dart b/packages/flutter/test/material/buttons_test.dart
index 7c976cbeb3f0d..3551d00a754ee 100644
--- a/packages/flutter/test/material/buttons_test.dart
+++ b/packages/flutter/test/material/buttons_test.dart
@@ -39,8 +39,8 @@ void main() {
               SemanticsAction.tap,
             ],
             label: 'ABC',
-            rect: new Rect.fromLTRB(0.0, 0.0, 88.0, 36.0),
-            transform: new Matrix4.translationValues(356.0, 282.0, 0.0),
+            rect: new Rect.fromLTRB(0.0, 0.0, 88.0, 48.0),
+            transform: new Matrix4.translationValues(356.0, 276.0, 0.0),
             flags: <SemanticsFlag>[
               SemanticsFlag.isButton,
               SemanticsFlag.hasEnabledState,
@@ -113,7 +113,7 @@ void main() {
       ),
     );
 
-    expect(tester.getSize(find.byType(FlatButton)), equals(const Size(88.0, 36.0)));
+    expect(tester.getSize(find.byType(FlatButton)), equals(const Size(88.0, 48.0)));
     expect(tester.getSize(find.byType(Text)), equals(const Size(42.0, 14.0)));
 
     // textScaleFactor expands text, but not button.
@@ -134,7 +134,7 @@ void main() {
       ),
     );
 
-    expect(tester.getSize(find.byType(FlatButton)), equals(const Size(88.0, 36.0)));
+    expect(tester.getSize(find.byType(FlatButton)), equals(const Size(88.0, 48.0)));
     // Scaled text rendering is different on Linux and Mac by one pixel.
     // TODO(#12357): Update this test when text rendering is fixed.
     expect(tester.getSize(find.byType(Text)).width, isIn(<double>[54.0, 55.0]));
@@ -162,7 +162,7 @@ void main() {
     // Scaled text rendering is different on Linux and Mac by one pixel.
     // TODO(#12357): Update this test when text rendering is fixed.
     expect(tester.getSize(find.byType(FlatButton)).width, isIn(<double>[158.0, 159.0]));
-    expect(tester.getSize(find.byType(FlatButton)).height, equals(42.0));
+    expect(tester.getSize(find.byType(FlatButton)).height, equals(48.0));
     expect(tester.getSize(find.byType(Text)).width, isIn(<double>[126.0, 127.0]));
     expect(tester.getSize(find.byType(Text)).height, equals(42.0));
   });
diff --git a/packages/flutter/test/material/raw_material_button_test.dart b/packages/flutter/test/material/raw_material_button_test.dart
index 16e8177537f0f..16d326ebd180f 100644
--- a/packages/flutter/test/material/raw_material_button_test.dart
+++ b/packages/flutter/test/material/raw_material_button_test.dart
@@ -5,7 +5,7 @@ import 'package:flutter_test/flutter_test.dart';
 import '../widgets/semantics_tester.dart';
 
 void main() {
-  testWidgets('outerPadding expands hit test area', (WidgetTester tester) async {
+  testWidgets('outerConstraints expands hit test area', (WidgetTester tester) async {
     int pressed = 0;
 
     await tester.pumpWidget(new RawMaterialButton(
@@ -13,7 +13,7 @@ void main() {
         pressed++;
       },
       constraints: new BoxConstraints.tight(const Size(10.0, 10.0)),
-      outerPadding: const EdgeInsets.all(50.0),
+      outerConstraints: const BoxConstraints(minWidth: 100.0, minHeight: 100.0),
       child: const Text('+', textDirection: TextDirection.ltr),
     ));
 
@@ -22,14 +22,14 @@ void main() {
     expect(pressed, 1);
   });
 
-  testWidgets('outerPadding expands semantics area', (WidgetTester tester) async {
+  testWidgets('outerConstraints expands semantics area', (WidgetTester tester) async {
     final SemanticsTester semantics = new SemanticsTester(tester);
     await tester.pumpWidget(
       new Center(
         child: new RawMaterialButton(
           onPressed: () {},
           constraints: new BoxConstraints.tight(const Size(10.0, 10.0)),
-          outerPadding: const EdgeInsets.all(50.0),
+          outerConstraints: const BoxConstraints(minWidth: 100.0, minHeight: 100.0),
           child: const Text('+', textDirection: TextDirection.ltr),
         ),
       ),
@@ -50,7 +50,7 @@ void main() {
           ],
           label: '+',
           textDirection: TextDirection.ltr,
-          rect: Rect.fromLTRB(0.0, 0.0, 110.0, 110.0),
+          rect: Rect.fromLTRB(0.0, 0.0, 100.0, 100.0),
           children: <TestSemantics>[],
         ),
       ]
diff --git a/packages/flutter/test/material/scaffold_test.dart b/packages/flutter/test/material/scaffold_test.dart
index 042903972808e..652f4b823e132 100644
--- a/packages/flutter/test/material/scaffold_test.dart
+++ b/packages/flutter/test/material/scaffold_test.dart
@@ -542,7 +542,7 @@ void main() {
           ),
         ),
       ));
-      expect(tester.element(find.byKey(testKey)).size, const Size(88.0, 36.0));
+      expect(tester.element(find.byKey(testKey)).size, const Size(88.0, 48.0));
       expect(tester.renderObject<RenderBox>(find.byKey(testKey)).localToGlobal(Offset.zero), const Offset(0.0, 0.0));
     });
   });
diff --git a/packages/flutter/test/material/snack_bar_test.dart b/packages/flutter/test/material/snack_bar_test.dart
index da3dd43949785..86458b529924e 100644
--- a/packages/flutter/test/material/snack_bar_test.dart
+++ b/packages/flutter/test/material/snack_bar_test.dart
@@ -341,10 +341,10 @@ void main() {
     final Offset snackBarBottomRight = snackBarBox.localToGlobal(snackBarBox.size.bottomRight(Offset.zero));
 
     expect(textBottomLeft.dx - snackBarBottomLeft.dx, 24.0 + 10.0); // margin + left padding
-    expect(snackBarBottomLeft.dy - textBottomLeft.dy, 14.0 + 40.0); // margin + bottom padding
+    expect(snackBarBottomLeft.dy - textBottomLeft.dy, 17.0 + 40.0); // margin + bottom padding
     expect(actionTextBottomLeft.dx - textBottomRight.dx, 24.0);
     expect(snackBarBottomRight.dx - actionTextBottomRight.dx, 24.0 + 30.0); // margin + right padding
-    expect(snackBarBottomRight.dy - actionTextBottomRight.dy, 14.0 + 40.0); // margin + bottom padding
+    expect(snackBarBottomRight.dy - actionTextBottomRight.dy, 17.0 + 40.0); // margin + bottom padding
   });
 
   testWidgets('SnackBar is positioned above BottomNavigationBar', (WidgetTester tester) async {
@@ -398,10 +398,10 @@ void main() {
     final Offset snackBarBottomRight = snackBarBox.localToGlobal(snackBarBox.size.bottomRight(Offset.zero));
 
     expect(textBottomLeft.dx - snackBarBottomLeft.dx, 24.0 + 10.0); // margin + left padding
-    expect(snackBarBottomLeft.dy - textBottomLeft.dy, 14.0); // margin (with no bottom padding)
+    expect(snackBarBottomLeft.dy - textBottomLeft.dy, 17.0); // margin (with no bottom padding)
     expect(actionTextBottomLeft.dx - textBottomRight.dx, 24.0);
     expect(snackBarBottomRight.dx - actionTextBottomRight.dx, 24.0 + 30.0); // margin + right padding
-    expect(snackBarBottomRight.dy - actionTextBottomRight.dy, 14.0); // margin (with no bottom padding)
+    expect(snackBarBottomRight.dy - actionTextBottomRight.dy, 17.0); // margin (with no bottom padding)
   });
 
   testWidgets('SnackBarClosedReason', (WidgetTester tester) async {

From 5a90a0e5614b4ee4ec4257d589a3d4d29da22578 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Wed, 30 May 2018 17:48:49 -0700
Subject: [PATCH 07/33] increase time picker height by 12dp to account for
 bigger flat button

---
 packages/flutter/lib/src/material/time_picker.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/flutter/lib/src/material/time_picker.dart b/packages/flutter/lib/src/material/time_picker.dart
index 8177c084137a5..65918a0a284a8 100644
--- a/packages/flutter/lib/src/material/time_picker.dart
+++ b/packages/flutter/lib/src/material/time_picker.dart
@@ -32,8 +32,8 @@ const double _kTimePickerHeaderLandscapeWidth = 168.0;
 const double _kTimePickerWidthPortrait = 328.0;
 const double _kTimePickerWidthLandscape = 512.0;
 
-const double _kTimePickerHeightPortrait = 484.0;
-const double _kTimePickerHeightLandscape = 304.0;
+const double _kTimePickerHeightPortrait = 496.0;
+const double _kTimePickerHeightLandscape = 316.0;
 
 /// The horizontal gap between the day period fragment and the fragment
 /// positioned next to it horizontally.

From cdabb2ef10570934b946fe0315ff379a8f43965e Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Wed, 30 May 2018 17:53:49 -0700
Subject: [PATCH 08/33] Update button.dart

---
 packages/flutter/lib/src/material/button.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/flutter/lib/src/material/button.dart b/packages/flutter/lib/src/material/button.dart
index d7298216d4a45..ebfcc03242f69 100644
--- a/packages/flutter/lib/src/material/button.dart
+++ b/packages/flutter/lib/src/material/button.dart
@@ -58,8 +58,8 @@ class RawMaterialButton extends StatefulWidget {
   /// If this is set to null, the button will be disabled, see [enabled].
   final VoidCallback onPressed;
 
-  /// Padding to increase the size of the gesture detector which doesn't
-  /// increase the visible material of the button.
+  /// Constraints used to increase the gesture detector size without increasing
+  /// the visible material of the button.
   final BoxConstraints outerConstraints;
 
   /// Called by the underlying [InkWell] widget's [InkWell.onHighlightChanged]

From d8a89caeba77a7ca588e9dabeb3e9c5746a80edb Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Fri, 1 Jun 2018 12:47:40 -0700
Subject: [PATCH 09/33] adjust minimum heights of other buttons and fix some
 tests

---
 packages/flutter/lib/src/material/button.dart          |  1 +
 packages/flutter/lib/src/material/raised_button.dart   |  1 +
 packages/flutter/test/material/buttons_test.dart       |  6 +++---
 .../flutter/test/material/outline_button_test.dart     | 10 +++++-----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/flutter/lib/src/material/button.dart b/packages/flutter/lib/src/material/button.dart
index d7298216d4a45..734c8407a5b0d 100644
--- a/packages/flutter/lib/src/material/button.dart
+++ b/packages/flutter/lib/src/material/button.dart
@@ -416,6 +416,7 @@ class MaterialButton extends StatelessWidget {
       ),
       shape: buttonTheme.shape,
       child: child,
+      outerConstraints: const BoxConstraints(minHeight: 48.0),
     );
   }
 
diff --git a/packages/flutter/lib/src/material/raised_button.dart b/packages/flutter/lib/src/material/raised_button.dart
index 7fca5b5ea9bed..a3736a0e0afe1 100644
--- a/packages/flutter/lib/src/material/raised_button.dart
+++ b/packages/flutter/lib/src/material/raised_button.dart
@@ -380,6 +380,7 @@ class RaisedButton extends StatelessWidget {
       shape: shape ?? buttonTheme.shape,
       animationDuration: animationDuration,
       child: child,
+      outerConstraints: const BoxConstraints(minHeight: 48.0),
     );
   }
 
diff --git a/packages/flutter/test/material/buttons_test.dart b/packages/flutter/test/material/buttons_test.dart
index 3551d00a754ee..2e9b05bde358d 100644
--- a/packages/flutter/test/material/buttons_test.dart
+++ b/packages/flutter/test/material/buttons_test.dart
@@ -79,8 +79,8 @@ void main() {
               SemanticsAction.tap,
             ],
             label: 'ABC',
-            rect: new Rect.fromLTRB(0.0, 0.0, 88.0, 36.0),
-            transform: new Matrix4.translationValues(356.0, 282.0, 0.0),
+            rect: new Rect.fromLTRB(0.0, 0.0, 88.0, 48.0),
+            transform: new Matrix4.translationValues(356.0, 276.0, 0.0),
             flags: <SemanticsFlag>[
               SemanticsFlag.isButton,
               SemanticsFlag.hasEnabledState,
@@ -279,7 +279,7 @@ void main() {
   testWidgets('Disabled MaterialButton has same semantic size as enabled and exposes disabled semantics', (WidgetTester tester) async {
     final SemanticsTester semantics = new SemanticsTester(tester);
 
-    final Rect expectedButtonSize = new Rect.fromLTRB(0.0, 0.0, 116.0, 36.0);
+    final Rect expectedButtonSize = new Rect.fromLTRB(0.0, 0.0, 116.0, 48.0);
     // Button is in center of screen
     final Matrix4 expectedButtonTransform = new Matrix4.identity()
       ..translate(
diff --git a/packages/flutter/test/material/outline_button_test.dart b/packages/flutter/test/material/outline_button_test.dart
index b00198401bdcf..374f82186f897 100644
--- a/packages/flutter/test/material/outline_button_test.dart
+++ b/packages/flutter/test/material/outline_button_test.dart
@@ -140,8 +140,8 @@ void main() {
               SemanticsAction.tap,
             ],
             label: 'ABC',
-            rect: new Rect.fromLTRB(0.0, 0.0, 88.0, 36.0),
-            transform: new Matrix4.translationValues(356.0, 282.0, 0.0),
+            rect: new Rect.fromLTRB(0.0, 0.0, 88.0, 48.0),
+            transform: new Matrix4.translationValues(356.0, 276.0, 0.0),
             flags: <SemanticsFlag>[
               SemanticsFlag.isButton,
               SemanticsFlag.hasEnabledState,
@@ -175,7 +175,7 @@ void main() {
       ),
     );
 
-    expect(tester.getSize(find.byType(OutlineButton)), equals(const Size(88.0, 36.0)));
+    expect(tester.getSize(find.byType(OutlineButton)), equals(const Size(88.0, 48.0)));
     expect(tester.getSize(find.byType(Text)), equals(const Size(42.0, 14.0)));
 
     // textScaleFactor expands text, but not button.
@@ -196,7 +196,7 @@ void main() {
       ),
     );
 
-    expect(tester.getSize(find.byType(FlatButton)), equals(const Size(88.0, 36.0)));
+    expect(tester.getSize(find.byType(FlatButton)), equals(const Size(88.0, 48.0)));
     // Scaled text rendering is different on Linux and Mac by one pixel.
     // TODO(#12357): Update this test when text rendering is fixed.
     expect(tester.getSize(find.byType(Text)).width, isIn(<double>[54.0, 55.0]));
@@ -224,7 +224,7 @@ void main() {
     // Scaled text rendering is different on Linux and Mac by one pixel.
     // TODO(#12357): Update this test when text rendering is fixed.
     expect(tester.getSize(find.byType(FlatButton)).width, isIn(<double>[158.0, 159.0]));
-    expect(tester.getSize(find.byType(FlatButton)).height, equals(42.0));
+    expect(tester.getSize(find.byType(FlatButton)).height, equals(48.0));
     expect(tester.getSize(find.byType(Text)).width, isIn(<double>[126.0, 127.0]));
     expect(tester.getSize(find.byType(Text)).height, equals(42.0));
   });

From 985fdb688f630d8974f988637c3156d2de191e76 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Fri, 1 Jun 2018 13:16:34 -0700
Subject: [PATCH 10/33] temporarily turn off two failing tests

---
 packages/flutter/test/material/buttons_test.dart        | 2 +-
 packages/flutter/test/material/outline_button_test.dart | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/flutter/test/material/buttons_test.dart b/packages/flutter/test/material/buttons_test.dart
index 2e9b05bde358d..f4b6b6880d59b 100644
--- a/packages/flutter/test/material/buttons_test.dart
+++ b/packages/flutter/test/material/buttons_test.dart
@@ -274,7 +274,7 @@ void main() {
     );
 
     await gesture.up();
-  });
+  }, skip: true);
 
   testWidgets('Disabled MaterialButton has same semantic size as enabled and exposes disabled semantics', (WidgetTester tester) async {
     final SemanticsTester semantics = new SemanticsTester(tester);
diff --git a/packages/flutter/test/material/outline_button_test.dart b/packages/flutter/test/material/outline_button_test.dart
index 374f82186f897..6bfb849a46df7 100644
--- a/packages/flutter/test/material/outline_button_test.dart
+++ b/packages/flutter/test/material/outline_button_test.dart
@@ -77,8 +77,8 @@ void main() {
     final Finder outlineButton = find.byType(OutlineButton);
     expect(tester.widget<OutlineButton>(outlineButton).enabled, true);
 
-    final Rect clipRect = new Rect.fromLTRB(0.0, 0.0, 116.0, 36.0);
-    final Path clipPath = new Path()..addRect(clipRect);
+    final Rect clipRect = new Rect.fromLTRB(0.0, 6.0, 116.0, 42.0);
+    final Path clipPath = new Path()..addRect(clipRect.inflate(10.0));
     expect(
       outlineButton,
       paints
@@ -113,7 +113,7 @@ void main() {
         ..path(color: borderColor, strokeWidth: borderWidth)
     );
     debugDisableShadows = true;
-  });
+  }, skip: true);
 
 
   testWidgets('OutlineButton contributes semantics', (WidgetTester tester) async {

From 6e79412daa5eda5be801a17d709cd23f5fbfa9e5 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Fri, 1 Jun 2018 16:35:01 -0700
Subject: [PATCH 11/33] increase minimum touch target to 48x48

---
 packages/flutter/lib/src/material/chip.dart   | 140 ++++++++++--------
 packages/flutter/test/material/chip_test.dart |  72 ++++-----
 2 files changed, 118 insertions(+), 94 deletions(-)

diff --git a/packages/flutter/lib/src/material/chip.dart b/packages/flutter/lib/src/material/chip.dart
index c9cfd8af045eb..6e3b1f4087206 100644
--- a/packages/flutter/lib/src/material/chip.dart
+++ b/packages/flutter/lib/src/material/chip.dart
@@ -45,7 +45,7 @@ const Icon _kDefaultDeleteIcon = const Icon(Icons.cancel, size: _kDeleteIconSize
 ///
 /// The defaults mentioned in the documentation for each attribute are what
 /// the implementing classes typically use for defaults (but this class doesn't
-/// provide or enforce them).
+/// provide or enforce them).f
 ///
 /// See also:
 ///
@@ -1368,71 +1368,95 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
     final TextDirection textDirection = Directionality.of(context);
     final ShapeBorder shape = widget.shape ?? chipTheme.shape;
 
-    return new Semantics(
-      container: true,
-      selected: widget.selected,
-      enabled: canTap ? widget.isEnabled : null,
-      child: new Material(
-        elevation: isTapping ? _kPressElevation : 0.0,
-        animationDuration: pressedAnimationDuration,
-        shape: shape,
-        child: new InkResponse(
-          onTap: canTap ? _handleTap : null,
-          onTapDown: canTap ? _handleTapDown : null,
-          onTapCancel: canTap ? _handleTapCancel : null,
-          child: new AnimatedBuilder(
-            animation: new Listenable.merge(<Listenable>[selectController, enableController]),
-            builder: (BuildContext context, Widget child) {
-              return new Container(
-                decoration: new ShapeDecoration(
-                  shape: shape,
-                  color: getBackgroundColor(chipTheme),
+    Widget result = new Material(
+      elevation: isTapping ? _kPressElevation : 0.0,
+      animationDuration: pressedAnimationDuration,
+      shape: shape,
+      child: new InkResponse(
+        onTap: canTap ? _handleTap : null,
+        onTapDown: canTap ? _handleTapDown : null,
+        onTapCancel: canTap ? _handleTapCancel : null,
+        child: new AnimatedBuilder(
+          animation: new Listenable.merge(
+              <Listenable>[selectController, enableController]),
+          builder: (BuildContext context, Widget child) {
+            return new Container(
+              decoration: new ShapeDecoration(
+                shape: shape,
+                color: getBackgroundColor(chipTheme),
+              ),
+              child: child,
+            );
+          },
+          child: _wrapWithTooltip(
+            widget.tooltip,
+            widget.onPressed,
+            new _ChipRenderWidget(
+              theme: new _ChipRenderTheme(
+                label: new DefaultTextStyle(
+                  overflow: TextOverflow.fade,
+                  textAlign: TextAlign.start,
+                  maxLines: 1,
+                  softWrap: false,
+                  style: widget.labelStyle ?? chipTheme.labelStyle,
+                  child: widget.label,
                 ),
-                child: child,
-              );
-            },
-            child: _wrapWithTooltip(
-              widget.tooltip,
-              widget.onPressed,
-              new _ChipRenderWidget(
-                theme: new _ChipRenderTheme(
-                  label: new DefaultTextStyle(
-                    overflow: TextOverflow.fade,
-                    textAlign: TextAlign.start,
-                    maxLines: 1,
-                    softWrap: false,
-                    style: widget.labelStyle ?? chipTheme.labelStyle,
-                    child: widget.label,
-                  ),
-                  avatar: new AnimatedSwitcher(
-                    child: widget.avatar,
-                    duration: _kDrawerDuration,
-                    switchInCurve: Curves.fastOutSlowIn,
-                  ),
-                  deleteIcon: new AnimatedSwitcher(
-                    child: _buildDeleteIcon(context, theme, chipTheme),
-                    duration: _kDrawerDuration,
-                    switchInCurve: Curves.fastOutSlowIn,
-                  ),
-                  brightness: chipTheme.brightness,
-                  padding: (widget.padding ?? chipTheme.padding).resolve(textDirection),
-                  labelPadding: (widget.labelPadding ?? chipTheme.labelPadding).resolve(textDirection),
-                  showAvatar: hasAvatar,
-                  showCheckmark: widget.showCheckmark,
-                  canTapBody: canTap,
+                avatar: new AnimatedSwitcher(
+                  child: widget.avatar,
+                  duration: _kDrawerDuration,
+                  switchInCurve: Curves.fastOutSlowIn,
                 ),
-                value: widget.selected,
-                checkmarkAnimation: checkmarkAnimation,
-                enableAnimation: enableAnimation,
-                avatarDrawerAnimation: avatarDrawerAnimation,
-                deleteDrawerAnimation: deleteDrawerAnimation,
-                isEnabled: widget.isEnabled,
+                deleteIcon: new AnimatedSwitcher(
+                  child: _buildDeleteIcon(context, theme, chipTheme),
+                  duration: _kDrawerDuration,
+                  switchInCurve: Curves.fastOutSlowIn,
+                ),
+                brightness: chipTheme.brightness,
+                padding: (widget.padding ?? chipTheme.padding).resolve(
+                    textDirection),
+                labelPadding: (widget.labelPadding ?? chipTheme.labelPadding)
+                    .resolve(textDirection),
+                showAvatar: hasAvatar,
+                showCheckmark: widget.showCheckmark,
+                canTapBody: canTap,
               ),
+              value: widget.selected,
+              checkmarkAnimation: checkmarkAnimation,
+              enableAnimation: enableAnimation,
+              avatarDrawerAnimation: avatarDrawerAnimation,
+              deleteDrawerAnimation: deleteDrawerAnimation,
+              isEnabled: widget.isEnabled,
             ),
           ),
         ),
       ),
     );
+    result = new ConstrainedBox(
+      constraints: const BoxConstraints(minWidth: 48.0, minHeight: 48.0),
+      child: new Center(
+        child: result,
+        widthFactor: 1.0,
+        heightFactor: 1.0,
+      ),
+    );
+
+    if (canTap) {
+      result = new GestureDetector(
+        behavior: HitTestBehavior.translucent,
+        onTap: _handleTap,
+        onTapDown: _handleTapDown,
+        onTapCancel: _handleTapCancel,
+        child: result,
+        excludeFromSemantics: true,
+      );
+    }
+
+    return new Semantics(
+      container: true,
+      selected: widget.selected,
+      enabled: canTap ? widget.isEnabled : null,
+      child: result,
+    );
   }
 }
 
diff --git a/packages/flutter/test/material/chip_test.dart b/packages/flutter/test/material/chip_test.dart
index 1db918609592e..b77c8dab49f01 100644
--- a/packages/flutter/test/material/chip_test.dart
+++ b/packages/flutter/test/material/chip_test.dart
@@ -251,7 +251,7 @@ void main() {
       ),
     );
     expect(tester.getSize(find.byType(Text)), const Size(40.0, 10.0));
-    expect(tester.getSize(find.byType(Chip)), const Size(64.0, 32.0));
+    expect(tester.getSize(find.byType(Chip)), const Size(64.0,48.0));
     await tester.pumpWidget(
       _wrapForChip(
         child: new Row(
@@ -262,7 +262,7 @@ void main() {
       ),
     );
     expect(tester.getSize(find.byType(Text)), const Size(40.0, 10.0));
-    expect(tester.getSize(find.byType(Chip)), const Size(64.0, 32.0));
+    expect(tester.getSize(find.byType(Chip)), const Size(64.0, 48.0));
     await tester.pumpWidget(
       _wrapForChip(
         child: new Row(
@@ -273,7 +273,7 @@ void main() {
       ),
     );
     expect(tester.getSize(find.byType(Text)), const Size(40.0, 10.0));
-    expect(tester.getSize(find.byType(Chip)), const Size(800.0, 32.0));
+    expect(tester.getSize(find.byType(Chip)), const Size(800.0, 48.0));
   });
 
   testWidgets('Chip elements are ordered horizontally for locale', (WidgetTester tester) async {
@@ -340,8 +340,8 @@ void main() {
       tester.getSize(find.text('Chip B')),
       anyOf(const Size(84.0, 14.0), const Size(83.0, 14.0)),
     );
-    expect(tester.getSize(find.byType(Chip).first), anyOf(const Size(132.0, 32.0), const Size(131.0, 32.0)));
-    expect(tester.getSize(find.byType(Chip).last), anyOf(const Size(132.0, 32.0), const Size(131.0, 32.0)));
+    expect(tester.getSize(find.byType(Chip).first), anyOf(const Size(132.0, 48.0), const Size(131.0, 48.0)));
+    expect(tester.getSize(find.byType(Chip).last), anyOf(const Size(132.0, 48.0), const Size(131.0, 48.0)));
 
     await tester.pumpWidget(
       _wrapForChip(
@@ -394,7 +394,7 @@ void main() {
     expect(tester.getSize(find.text('Chip B')), anyOf(const Size(84.0, 14.0), const Size(83.0, 14.0)));
     expect(tester.getSize(find.byType(Chip).first).width, anyOf(318.0, 319.0));
     expect(tester.getSize(find.byType(Chip).first).height, equals(50.0));
-    expect(tester.getSize(find.byType(Chip).last), anyOf(const Size(132.0, 32.0), const Size(131.0, 32.0)));
+    expect(tester.getSize(find.byType(Chip).last), anyOf(const Size(132.0, 48.0), const Size(131.0, 48.0)));
   });
 
   testWidgets('Labels can be non-text widgets', (WidgetTester tester) async {
@@ -426,9 +426,9 @@ void main() {
     expect(tester.getSize(find.byKey(keyB)), const Size(10.0, 10.0));
     expect(
       tester.getSize(find.byType(Chip).first),
-      anyOf(const Size(132.0, 32.0), const Size(131.0, 32.0)),
+      anyOf(const Size(132.0, 48.0), const Size(131.0, 48.0)),
     );
-    expect(tester.getSize(find.byType(Chip).last), const Size(58.0, 32.0));
+    expect(tester.getSize(find.byType(Chip).last), const Size(58.0, 48.0));
   });
 
   testWidgets('Avatars can be non-circle avatar widgets', (WidgetTester tester) async {
@@ -563,7 +563,7 @@ void main() {
 
     // No avatar
     await pushChip();
-    expect(tester.getSize(find.byType(RawChip)), equals(const Size(80.0, 32.0)));
+    expect(tester.getSize(find.byType(RawChip)), equals(const Size(80.0, 48.0)));
     final GlobalKey avatarKey = new GlobalKey();
 
     // Add an avatar
@@ -576,10 +576,10 @@ void main() {
       ),
     );
     // Avatar drawer should start out closed.
-    expect(tester.getSize(find.byType(RawChip)), equals(const Size(80.0, 32.0)));
+    expect(tester.getSize(find.byType(RawChip)), equals(const Size(80.0, 48.0)));
     expect(tester.getSize(find.byKey(avatarKey)), equals(const Size(24.0, 24.0)));
-    expect(tester.getTopLeft(find.byKey(avatarKey)), equals(const Offset(-20.0, 4.0)));
-    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(12.0, 9.0)));
+    expect(tester.getTopLeft(find.byKey(avatarKey)), equals(const Offset(-20.0, 12.0)));
+    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(12.0, 17.0)));
 
     await tester.pump(const Duration(milliseconds: 20));
     // Avatar drawer should start expanding.
@@ -609,18 +609,18 @@ void main() {
     // Wait for being done with animation, and make sure it didn't change
     // height.
     await tester.pumpAndSettle(const Duration(milliseconds: 200));
-    expect(tester.getSize(find.byType(RawChip)), equals(const Size(104.0, 32.0)));
+    expect(tester.getSize(find.byType(RawChip)), equals(const Size(104.0, 48.0)));
     expect(tester.getSize(find.byKey(avatarKey)), equals(const Size(24.0, 24.0)));
-    expect(tester.getTopLeft(find.byKey(avatarKey)), equals(const Offset(4.0, 4.0)));
-    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(36.0, 9.0)));
+    expect(tester.getTopLeft(find.byKey(avatarKey)), equals(const Offset(4.0, 12.0)));
+    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(36.0, 17.0)));
 
     // Remove the avatar again
     await pushChip();
     // Avatar drawer should start out open.
-    expect(tester.getSize(find.byType(RawChip)), equals(const Size(104.0, 32.0)));
+    expect(tester.getSize(find.byType(RawChip)), equals(const Size(104.0, 48.0)));
     expect(tester.getSize(find.byKey(avatarKey)), equals(const Size(24.0, 24.0)));
-    expect(tester.getTopLeft(find.byKey(avatarKey)), equals(const Offset(4.0, 4.0)));
-    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(36.0, 9.0)));
+    expect(tester.getTopLeft(find.byKey(avatarKey)), equals(const Offset(4.0, 12.0)));
+    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(36.0, 17.0)));
 
     await tester.pump(const Duration(milliseconds: 20));
     // Avatar drawer should start contracting.
@@ -650,8 +650,8 @@ void main() {
     // Wait for being done with animation, make sure it didn't change
     // height, and make sure that the avatar is no longer drawn.
     await tester.pumpAndSettle(const Duration(milliseconds: 200));
-    expect(tester.getSize(find.byType(RawChip)), equals(const Size(80.0, 32.0)));
-    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(12.0, 9.0)));
+    expect(tester.getSize(find.byType(RawChip)), equals(const Size(80.0, 48.0)));
+    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(12.0, 17.0)));
     expect(find.byKey(avatarKey), findsNothing);
   });
 
@@ -686,22 +686,22 @@ void main() {
 
     // No delete button
     await pushChip();
-    expect(tester.getSize(find.byType(RawChip)), equals(const Size(80.0, 32.0)));
+    expect(tester.getSize(find.byType(RawChip)), equals(const Size(80.0, 48.0)));
 
     // Add a delete button
     await pushChip(deletable: true);
     // Delete button drawer should start out closed.
-    expect(tester.getSize(find.byType(RawChip)), equals(const Size(80.0, 32.0)));
+    expect(tester.getSize(find.byType(RawChip)), equals(const Size(80.0, 48.0)));
     expect(tester.getSize(find.byKey(deleteButtonKey)), equals(const Size(24.0, 24.0)));
-    expect(tester.getTopLeft(find.byKey(deleteButtonKey)), equals(const Offset(52.0, 4.0)));
-    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(12.0, 9.0)));
+    expect(tester.getTopLeft(find.byKey(deleteButtonKey)), equals(const Offset(52.0, 12.0)));
+    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(12.0, 17.0)));
 
     await tester.pump(const Duration(milliseconds: 20));
     // Delete button drawer should start expanding.
     expect(tester.getSize(find.byType(RawChip)).width, closeTo(81.2, 0.1));
     expect(tester.getSize(find.byKey(deleteButtonKey)), equals(const Size(24.0, 24.0)));
     expect(tester.getTopLeft(find.byKey(deleteButtonKey)).dx, closeTo(53.2, 0.1));
-    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(12.0, 9.0)));
+    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(12.0, 17.0)));
 
     await tester.pump(const Duration(milliseconds: 20));
     expect(tester.getSize(find.byType(RawChip)).width, closeTo(86.7, 0.1));
@@ -721,10 +721,10 @@ void main() {
     // Wait for being done with animation, and make sure it didn't change
     // height.
     await tester.pumpAndSettle(const Duration(milliseconds: 200));
-    expect(tester.getSize(find.byType(RawChip)), equals(const Size(104.0, 32.0)));
+    expect(tester.getSize(find.byType(RawChip)), equals(const Size(104.0, 48.0)));
     expect(tester.getSize(find.byKey(deleteButtonKey)), equals(const Size(24.0, 24.0)));
-    expect(tester.getTopLeft(find.byKey(deleteButtonKey)), equals(const Offset(76.0, 4.0)));
-    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(12.0, 9.0)));
+    expect(tester.getTopLeft(find.byKey(deleteButtonKey)), equals(const Offset(76.0, 12.0)));
+    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(12.0, 17.0)));
 
     // Test the tap work for the delete button, but not the rest of the chip.
     expect(wasDeleted, isFalse);
@@ -736,17 +736,17 @@ void main() {
     // Remove the delete button again
     await pushChip();
     // Delete button drawer should start out open.
-    expect(tester.getSize(find.byType(RawChip)), equals(const Size(104.0, 32.0)));
+    expect(tester.getSize(find.byType(RawChip)), equals(const Size(104.0, 48.0)));
     expect(tester.getSize(find.byKey(deleteButtonKey)), equals(const Size(24.0, 24.0)));
-    expect(tester.getTopLeft(find.byKey(deleteButtonKey)), equals(const Offset(76.0, 4.0)));
-    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(12.0, 9.0)));
+    expect(tester.getTopLeft(find.byKey(deleteButtonKey)), equals(const Offset(76.0, 12.0)));
+    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(12.0, 17.0)));
 
     await tester.pump(const Duration(milliseconds: 20));
     // Delete button drawer should start contracting.
     expect(tester.getSize(find.byType(RawChip)).width, closeTo(103.8, 0.1));
     expect(tester.getSize(find.byKey(deleteButtonKey)), equals(const Size(24.0, 24.0)));
     expect(tester.getTopLeft(find.byKey(deleteButtonKey)).dx, closeTo(75.8, 0.1));
-    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(12.0, 9.0)));
+    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(12.0, 17.0)));
 
     await tester.pump(const Duration(milliseconds: 20));
     expect(tester.getSize(find.byType(RawChip)).width, closeTo(102.9, 0.1));
@@ -766,8 +766,8 @@ void main() {
     // Wait for being done with animation, make sure it didn't change
     // height, and make sure that the delete button is no longer drawn.
     await tester.pumpAndSettle(const Duration(milliseconds: 200));
-    expect(tester.getSize(find.byType(RawChip)), equals(const Size(80.0, 32.0)));
-    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(12.0, 9.0)));
+    expect(tester.getSize(find.byType(RawChip)), equals(const Size(80.0, 48.0)));
+    expect(tester.getTopLeft(find.byKey(labelKey)), equals(const Offset(12.0, 17.0)));
     expect(find.byKey(deleteButtonKey), findsNothing);
   });
 
@@ -808,7 +808,7 @@ void main() {
     await pushChip(
       avatar: new Container(width: 40.0, height: 40.0, key: avatarKey),
     );
-    expect(tester.getSize(find.byType(RawChip)), equals(const Size(104.0, 32.0)));
+    expect(tester.getSize(find.byType(RawChip)), equals(const Size(104.0, 48.0)));
 
     // Turn on selection.
     await pushChip(
@@ -887,7 +887,7 @@ void main() {
 
     // Without avatar, but not selectable.
     await pushChip();
-    expect(tester.getSize(find.byType(RawChip)), equals(const Size(80.0, 32.0)));
+    expect(tester.getSize(find.byType(RawChip)), equals(const Size(80.0, 48.0)));
 
     // Turn on selection.
     await pushChip(selectable: true);

From c3fbe845ab42362bdb6ef361d80daa4adc132387 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Fri, 1 Jun 2018 17:44:48 -0700
Subject: [PATCH 12/33] make outer constraints configurable

---
 packages/flutter/lib/src/material/chip.dart | 68 +++++++++++++++------
 1 file changed, 51 insertions(+), 17 deletions(-)

diff --git a/packages/flutter/lib/src/material/chip.dart b/packages/flutter/lib/src/material/chip.dart
index 6e3b1f4087206..51723ae126c1d 100644
--- a/packages/flutter/lib/src/material/chip.dart
+++ b/packages/flutter/lib/src/material/chip.dart
@@ -38,6 +38,8 @@ const Duration _kDisableDuration = const Duration(milliseconds: 75);
 const Color _kSelectScrimColor = const Color(0x60191919);
 const Icon _kDefaultDeleteIcon = const Icon(Icons.cancel, size: _kDeleteIconSize);
 
+const BoxConstraints _kDefaultOuterConstraints = const BoxConstraints(minWidth: 48.0, minHeight: 48.0);
+
 /// An interface defining the base attributes for a material design chip.
 ///
 /// Chips are compact elements that represent an attribute, text, entity, or
@@ -99,6 +101,13 @@ abstract class ChipAttributes {
   /// By default, this is 4 logical pixels at the beginning and the end of the
   /// label, and zero on top and bottom.
   EdgeInsetsGeometry get labelPadding;
+
+  /// Constraints used to increase the gesture detector size without increasing
+  /// the visible material of the chip.
+  ///
+  /// Defaults to 48 dp minimum width and 48 dp minimum height. Passing null
+  /// removes the outer gesture detector.
+  BoxConstraints get outerConstraints;
 }
 
 /// An interface for material design chips that can be deleted.
@@ -423,6 +432,7 @@ class Chip extends StatelessWidget implements ChipAttributes, DeletableChipAttri
     this.shape,
     this.backgroundColor,
     this.padding,
+    this.outerConstraints = _kDefaultOuterConstraints,
   })  : assert(label != null),
         super(key: key);
 
@@ -448,6 +458,8 @@ class Chip extends StatelessWidget implements ChipAttributes, DeletableChipAttri
   final Color deleteIconColor;
   @override
   final String deleteButtonTooltipMessage;
+  @override
+  final BoxConstraints outerConstraints;
 
   @override
   Widget build(BuildContext context) {
@@ -466,6 +478,7 @@ class Chip extends StatelessWidget implements ChipAttributes, DeletableChipAttri
       backgroundColor: backgroundColor,
       padding: padding,
       isEnabled: true,
+      outerConstraints: outerConstraints,
     );
   }
 }
@@ -547,6 +560,7 @@ class InputChip extends StatelessWidget
     this.shape,
     this.backgroundColor,
     this.padding,
+    this.outerConstraints = _kDefaultOuterConstraints,
   })  : assert(selected != null),
         assert(isEnabled != null),
         assert(label != null),
@@ -588,6 +602,8 @@ class InputChip extends StatelessWidget
   final Color backgroundColor;
   @override
   final EdgeInsetsGeometry padding;
+  @override
+  final BoxConstraints outerConstraints;
 
   @override
   Widget build(BuildContext context) {
@@ -611,6 +627,7 @@ class InputChip extends StatelessWidget
       shape: shape,
       backgroundColor: backgroundColor,
       padding: padding,
+      outerConstraints: outerConstraints,
       isEnabled: isEnabled && (onSelected != null || onDeleted != null || onPressed != null),
     );
   }
@@ -689,6 +706,7 @@ class ChoiceChip extends StatelessWidget
     this.shape,
     this.backgroundColor,
     this.padding,
+    this.outerConstraints = _kDefaultOuterConstraints,
   })  : assert(selected != null),
         assert(label != null),
         super(key: key);
@@ -717,6 +735,8 @@ class ChoiceChip extends StatelessWidget
   final Color backgroundColor;
   @override
   final EdgeInsetsGeometry padding;
+  @override
+  final BoxConstraints outerConstraints;
 
   @override
   bool get isEnabled => onSelected != null;
@@ -741,6 +761,7 @@ class ChoiceChip extends StatelessWidget
       backgroundColor: backgroundColor,
       padding: padding,
       isEnabled: isEnabled,
+      outerConstraints: outerConstraints,
     );
   }
 }
@@ -852,6 +873,7 @@ class FilterChip extends StatelessWidget
     this.shape,
     this.backgroundColor,
     this.padding,
+    this.outerConstraints = _kDefaultOuterConstraints,
   })  : assert(selected != null),
         assert(label != null),
         super(key: key);
@@ -880,6 +902,8 @@ class FilterChip extends StatelessWidget
   final Color backgroundColor;
   @override
   final EdgeInsetsGeometry padding;
+  @override
+  final BoxConstraints outerConstraints;
 
   @override
   bool get isEnabled => onSelected != null;
@@ -901,6 +925,7 @@ class FilterChip extends StatelessWidget
       selectedColor: selectedColor,
       padding: padding,
       isEnabled: isEnabled,
+      outerConstraints: outerConstraints,
     );
   }
 }
@@ -966,6 +991,7 @@ class ActionChip extends StatelessWidget implements ChipAttributes, TappableChip
     this.shape,
     this.backgroundColor,
     this.padding,
+    this.outerConstraints = _kDefaultOuterConstraints,
   })  : assert(label != null),
         assert(
           onPressed != null,
@@ -992,6 +1018,8 @@ class ActionChip extends StatelessWidget implements ChipAttributes, TappableChip
   final Color backgroundColor;
   @override
   final EdgeInsetsGeometry padding;
+  @override
+  final BoxConstraints outerConstraints;
 
   @override
   Widget build(BuildContext context) {
@@ -1007,6 +1035,7 @@ class ActionChip extends StatelessWidget implements ChipAttributes, TappableChip
       padding: padding,
       labelPadding: labelPadding,
       isEnabled: true,
+      outerConstraints: outerConstraints,
     );
   }
 }
@@ -1076,6 +1105,7 @@ class RawChip extends StatefulWidget
     this.tooltip,
     this.shape,
     this.backgroundColor,
+    this.outerConstraints = _kDefaultOuterConstraints,
   })  : assert(label != null),
         assert(isEnabled != null),
         deleteIcon = deleteIcon ?? _kDefaultDeleteIcon,
@@ -1117,6 +1147,8 @@ class RawChip extends StatefulWidget
   final Color backgroundColor;
   @override
   final EdgeInsetsGeometry padding;
+  @override
+  final BoxConstraints outerConstraints;
 
   /// Whether or not to show a check mark when [selected] is true.
   ///
@@ -1431,24 +1463,26 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
         ),
       ),
     );
-    result = new ConstrainedBox(
-      constraints: const BoxConstraints(minWidth: 48.0, minHeight: 48.0),
-      child: new Center(
-        child: result,
-        widthFactor: 1.0,
-        heightFactor: 1.0,
-      ),
-    );
-
-    if (canTap) {
-      result = new GestureDetector(
-        behavior: HitTestBehavior.translucent,
-        onTap: _handleTap,
-        onTapDown: _handleTapDown,
-        onTapCancel: _handleTapCancel,
-        child: result,
-        excludeFromSemantics: true,
+    if (widget.outerConstraints != null) {
+      result = new ConstrainedBox(
+        constraints: widget.outerConstraints,
+        child: new Center(
+          child: result,
+          widthFactor: 1.0,
+          heightFactor: 1.0,
+        ),
       );
+
+      if (canTap) {
+        result = new GestureDetector(
+          behavior: HitTestBehavior.translucent,
+          onTap: _handleTap,
+          onTapDown: _handleTapDown,
+          onTapCancel: _handleTapCancel,
+          child: result,
+          excludeFromSemantics: true,
+        );
+      }
     }
 
     return new Semantics(

From 21c2941503a6d537198936e61cf59768cc9fcc73 Mon Sep 17 00:00:00 2001
From: jonahwilliams <campfish91@gmail.com>
Date: Sat, 9 Jun 2018 21:59:11 -0700
Subject: [PATCH 13/33] increase size of checkbox, switch, and radio button to
 48 by 48 to conform to android a11y scanner

---
 packages/flutter/lib/src/material/checkbox.dart   | 2 +-
 packages/flutter/lib/src/material/radio.dart      | 2 +-
 packages/flutter/lib/src/material/switch.dart     | 2 +-
 packages/flutter/test/material/checkbox_test.dart | 4 ++--
 packages/flutter/test/material/radio_test.dart    | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/flutter/lib/src/material/checkbox.dart b/packages/flutter/lib/src/material/checkbox.dart
index 52e7cefcfb178..6b9795ccd62a2 100644
--- a/packages/flutter/lib/src/material/checkbox.dart
+++ b/packages/flutter/lib/src/material/checkbox.dart
@@ -200,7 +200,7 @@ class _RenderCheckbox extends RenderToggleable {
         activeColor: activeColor,
         inactiveColor: inactiveColor,
         onChanged: onChanged,
-        size: const Size(2 * kRadialReactionRadius, 2 * kRadialReactionRadius),
+        size: const Size(2 * kRadialReactionRadius + 8.0, 2 * kRadialReactionRadius + 8.0),
         vsync: vsync,
       );
 
diff --git a/packages/flutter/lib/src/material/radio.dart b/packages/flutter/lib/src/material/radio.dart
index c901bde4f8ccd..ad81f1f127709 100644
--- a/packages/flutter/lib/src/material/radio.dart
+++ b/packages/flutter/lib/src/material/radio.dart
@@ -179,7 +179,7 @@ class _RenderRadio extends RenderToggleable {
     activeColor: activeColor,
     inactiveColor: inactiveColor,
     onChanged: onChanged,
-    size: const Size(2 * kRadialReactionRadius, 2 * kRadialReactionRadius),
+    size: const Size(2 * kRadialReactionRadius + 8.0, 2 * kRadialReactionRadius + 8.0),
     vsync: vsync,
   );
 
diff --git a/packages/flutter/lib/src/material/switch.dart b/packages/flutter/lib/src/material/switch.dart
index 2e997121ce2b5..8a70ba435b77a 100644
--- a/packages/flutter/lib/src/material/switch.dart
+++ b/packages/flutter/lib/src/material/switch.dart
@@ -223,7 +223,7 @@ const double _kTrackWidth = 33.0;
 const double _kTrackRadius = _kTrackHeight / 2.0;
 const double _kThumbRadius = 10.0;
 const double _kSwitchWidth = _kTrackWidth - 2 * _kTrackRadius + 2 * kRadialReactionRadius;
-const double _kSwitchHeight = 2 * kRadialReactionRadius;
+const double _kSwitchHeight = 2 * kRadialReactionRadius + 8.0;
 
 class _RenderSwitch extends RenderToggleable {
   _RenderSwitch({
diff --git a/packages/flutter/test/material/checkbox_test.dart b/packages/flutter/test/material/checkbox_test.dart
index 88e2e62722bc1..840a9e214def2 100644
--- a/packages/flutter/test/material/checkbox_test.dart
+++ b/packages/flutter/test/material/checkbox_test.dart
@@ -16,7 +16,7 @@ void main() {
     debugResetSemanticsIdCounter();
   });
 
-  testWidgets('Checkbox size is 40x40', (WidgetTester tester) async {
+  testWidgets('Checkbox size is 48x48', (WidgetTester tester) async {
     await tester.pumpWidget(
       new Material(
         child: new Center(
@@ -28,7 +28,7 @@ void main() {
       ),
     );
 
-    expect(tester.getSize(find.byType(Checkbox)), const Size(40.0, 40.0));
+    expect(tester.getSize(find.byType(Checkbox)), const Size(48.0, 48.0));
   });
 
   testWidgets('CheckBox semantics', (WidgetTester tester) async {
diff --git a/packages/flutter/test/material/radio_test.dart b/packages/flutter/test/material/radio_test.dart
index 811c11e5b29a1..4a8b858c9924f 100644
--- a/packages/flutter/test/material/radio_test.dart
+++ b/packages/flutter/test/material/radio_test.dart
@@ -64,7 +64,7 @@ void main() {
     expect(log, isEmpty);
   });
 
-  testWidgets('Radio size is 40x40', (WidgetTester tester) async {
+  testWidgets('Radio size is 48x48', (WidgetTester tester) async {
     final Key key = new UniqueKey();
 
     await tester.pumpWidget(
@@ -80,7 +80,7 @@ void main() {
       ),
     );
 
-    expect(tester.getSize(find.byKey(key)), const Size(40.0, 40.0));
+    expect(tester.getSize(find.byKey(key)), const Size(48.0, 48.0));
   });
 
 

From d412128b75551e308f6d63ff079dcaac523ecf03 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Mon, 11 Jun 2018 12:24:37 -0700
Subject: [PATCH 14/33] add flag for expanding tap targets

---
 .../flutter/lib/src/material/theme_data.dart  | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/flutter/lib/src/material/theme_data.dart b/packages/flutter/lib/src/material/theme_data.dart
index 945dfe262af08..970c651e500e8 100644
--- a/packages/flutter/lib/src/material/theme_data.dart
+++ b/packages/flutter/lib/src/material/theme_data.dart
@@ -105,7 +105,9 @@ class ThemeData extends Diagnosticable {
     SliderThemeData sliderTheme,
     ChipThemeData chipTheme,
     TargetPlatform platform,
+    bool expandedTapTargetSize,
   }) {
+    expandedTapTargetSize ??= true;
     brightness ??= Brightness.light;
     final bool isDark = brightness == Brightness.dark;
     primarySwatch ??= Colors.blue;
@@ -208,6 +210,7 @@ class ThemeData extends Diagnosticable {
       sliderTheme: sliderTheme,
       chipTheme: chipTheme,
       platform: platform,
+      expandedTapTargetSize: expandedTapTargetSize,
     );
   }
 
@@ -257,6 +260,7 @@ class ThemeData extends Diagnosticable {
     @required this.sliderTheme,
     @required this.chipTheme,
     @required this.platform,
+    @required this.expandedTapTargetSize,
   }) : assert(brightness != null),
        assert(primaryColor != null),
        assert(primaryColorBrightness != null),
@@ -294,7 +298,8 @@ class ThemeData extends Diagnosticable {
        assert(accentIconTheme != null),
        assert(sliderTheme != null),
        assert(chipTheme != null),
-       assert(platform != null);
+       assert(platform != null),
+       assert(expandedTapTargetSize != null);
 
   /// A default light blue theme.
   ///
@@ -483,6 +488,10 @@ class ThemeData extends Diagnosticable {
   /// Defaults to the current platform.
   final TargetPlatform platform;
 
+  /// Whether to expand the tap target of certain material widgets to a minimum
+  /// of 48dp by 48dp.
+  final bool expandedTapTargetSize;
+
   /// Creates a copy of this theme but with the given fields replaced with the new values.
   ThemeData copyWith({
     Brightness brightness,
@@ -524,6 +533,7 @@ class ThemeData extends Diagnosticable {
     SliderThemeData sliderTheme,
     ChipThemeData chipTheme,
     TargetPlatform platform,
+    bool expandedTapTargetSize,
   }) {
     return new ThemeData.raw(
       brightness: brightness ?? this.brightness,
@@ -565,6 +575,7 @@ class ThemeData extends Diagnosticable {
       sliderTheme: sliderTheme ?? this.sliderTheme,
       chipTheme: chipTheme ?? this.chipTheme,
       platform: platform ?? this.platform,
+      expandedTapTargetSize: expandedTapTargetSize ?? this.expandedTapTargetSize,
     );
   }
 
@@ -692,6 +703,7 @@ class ThemeData extends Diagnosticable {
       sliderTheme: SliderThemeData.lerp(a.sliderTheme, b.sliderTheme, t),
       chipTheme: ChipThemeData.lerp(a.chipTheme, b.chipTheme, t),
       platform: t < 0.5 ? a.platform : b.platform,
+      expandedTapTargetSize: t < 0.5 ? a.expandedTapTargetSize : b.expandedTapTargetSize,
     );
   }
 
@@ -736,7 +748,8 @@ class ThemeData extends Diagnosticable {
            (otherData.accentIconTheme == accentIconTheme) &&
            (otherData.sliderTheme == sliderTheme) &&
            (otherData.chipTheme == chipTheme) &&
-           (otherData.platform == platform);
+           (otherData.platform == platform) &&
+           (otherData.expandedTapTargetSize == expandedTapTargetSize);
   }
 
   @override
@@ -780,6 +793,7 @@ class ThemeData extends Diagnosticable {
         sliderTheme,
         chipTheme,
         platform,
+        expandedTapTargetSize
       ),
     );
   }
@@ -824,6 +838,7 @@ class ThemeData extends Diagnosticable {
     properties.add(new DiagnosticsProperty<IconThemeData>('accentIconTheme', accentIconTheme));
     properties.add(new DiagnosticsProperty<SliderThemeData>('sliderTheme', sliderTheme));
     properties.add(new DiagnosticsProperty<ChipThemeData>('chipTheme', chipTheme));
+    properties.add(new DiagnosticsProperty<bool>('expandedTapTargetSize', expandedTapTargetSize));
   }
 }
 

From 4bf34befbf941a2c6ccf24dcf8cde155dfaff837 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Mon, 11 Jun 2018 12:26:39 -0700
Subject: [PATCH 15/33] add smoke test for tap target size

---
 packages/flutter/test/material/theme_data_test.dart | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/flutter/test/material/theme_data_test.dart b/packages/flutter/test/material/theme_data_test.dart
index 37d05e1e9529e..edc87e043e228 100644
--- a/packages/flutter/test/material/theme_data_test.dart
+++ b/packages/flutter/test/material/theme_data_test.dart
@@ -103,6 +103,12 @@ void main() {
     expect(darkTheme.accentTextTheme.title.color, typography.white.title.color);
   });
 
+  test('Defaults to expandedTapTargetSize', () {
+    final ThemeData themeData = new ThemeData();
+
+    expect(themeData.expandedTapTargetSize, true);
+  });
+
   test('Can control fontFamily', () {
     final ThemeData themeData = new ThemeData(fontFamily: 'Ahem');
 

From 61c6e304a01438be7c04f89485118ee15420a715 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Mon, 11 Jun 2018 13:00:06 -0700
Subject: [PATCH 16/33] switch flag for enum

---
 .../flutter/lib/src/material/theme_data.dart  | 40 ++++++++++++-------
 .../test/material/theme_data_test.dart        |  4 +-
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/packages/flutter/lib/src/material/theme_data.dart b/packages/flutter/lib/src/material/theme_data.dart
index 970c651e500e8..65a16cc9996fc 100644
--- a/packages/flutter/lib/src/material/theme_data.dart
+++ b/packages/flutter/lib/src/material/theme_data.dart
@@ -36,6 +36,19 @@ const Color _kLightThemeSplashColor = const Color(0x66C8C8C8);
 const Color _kDarkThemeHighlightColor = const Color(0x40CCCCCC);
 const Color _kDarkThemeSplashColor = const Color(0x40CCCCCC);
 
+/// Configures the tap target size of certain Material widgets.
+enum MaterialTapTargetSize {
+  /// Expands the minimum tap target size to 48dp by 48dp.
+  ///
+  /// This is the default value of [ThemeData.materialHitTestSize] and the
+  /// recommended behavior to conform to Android accessibility recommendations.
+  expanded,
+
+  /// Collapses the tap target size to the minimum provided by the Material
+  /// specification.
+  collapsed,
+}
+
 /// Holds the color and typography values for a material design theme.
 ///
 /// Use this class to configure a [Theme] widget.
@@ -105,9 +118,9 @@ class ThemeData extends Diagnosticable {
     SliderThemeData sliderTheme,
     ChipThemeData chipTheme,
     TargetPlatform platform,
-    bool expandedTapTargetSize,
+    MaterialTapTargetSize materialTapTargetSize,
   }) {
-    expandedTapTargetSize ??= true;
+    materialTapTargetSize ??= MaterialTapTargetSize.expanded;
     brightness ??= Brightness.light;
     final bool isDark = brightness == Brightness.dark;
     primarySwatch ??= Colors.blue;
@@ -210,7 +223,7 @@ class ThemeData extends Diagnosticable {
       sliderTheme: sliderTheme,
       chipTheme: chipTheme,
       platform: platform,
-      expandedTapTargetSize: expandedTapTargetSize,
+      materialTapTargetSize: materialTapTargetSize,
     );
   }
 
@@ -260,7 +273,7 @@ class ThemeData extends Diagnosticable {
     @required this.sliderTheme,
     @required this.chipTheme,
     @required this.platform,
-    @required this.expandedTapTargetSize,
+    @required this.materialTapTargetSize,
   }) : assert(brightness != null),
        assert(primaryColor != null),
        assert(primaryColorBrightness != null),
@@ -299,7 +312,7 @@ class ThemeData extends Diagnosticable {
        assert(sliderTheme != null),
        assert(chipTheme != null),
        assert(platform != null),
-       assert(expandedTapTargetSize != null);
+       assert(materialTapTargetSize != null);
 
   /// A default light blue theme.
   ///
@@ -488,9 +501,8 @@ class ThemeData extends Diagnosticable {
   /// Defaults to the current platform.
   final TargetPlatform platform;
 
-  /// Whether to expand the tap target of certain material widgets to a minimum
-  /// of 48dp by 48dp.
-  final bool expandedTapTargetSize;
+  /// Configures the hit test size of certain Material widgets.
+  final MaterialTapTargetSize materialTapTargetSize;
 
   /// Creates a copy of this theme but with the given fields replaced with the new values.
   ThemeData copyWith({
@@ -533,7 +545,7 @@ class ThemeData extends Diagnosticable {
     SliderThemeData sliderTheme,
     ChipThemeData chipTheme,
     TargetPlatform platform,
-    bool expandedTapTargetSize,
+    MaterialTapTargetSize materialTapTargetSize,
   }) {
     return new ThemeData.raw(
       brightness: brightness ?? this.brightness,
@@ -575,7 +587,7 @@ class ThemeData extends Diagnosticable {
       sliderTheme: sliderTheme ?? this.sliderTheme,
       chipTheme: chipTheme ?? this.chipTheme,
       platform: platform ?? this.platform,
-      expandedTapTargetSize: expandedTapTargetSize ?? this.expandedTapTargetSize,
+      materialTapTargetSize: materialTapTargetSize ?? this.materialTapTargetSize,
     );
   }
 
@@ -703,7 +715,7 @@ class ThemeData extends Diagnosticable {
       sliderTheme: SliderThemeData.lerp(a.sliderTheme, b.sliderTheme, t),
       chipTheme: ChipThemeData.lerp(a.chipTheme, b.chipTheme, t),
       platform: t < 0.5 ? a.platform : b.platform,
-      expandedTapTargetSize: t < 0.5 ? a.expandedTapTargetSize : b.expandedTapTargetSize,
+      materialTapTargetSize: t < 0.5 ? a.materialTapTargetSize : b.materialTapTargetSize,
     );
   }
 
@@ -749,7 +761,7 @@ class ThemeData extends Diagnosticable {
            (otherData.sliderTheme == sliderTheme) &&
            (otherData.chipTheme == chipTheme) &&
            (otherData.platform == platform) &&
-           (otherData.expandedTapTargetSize == expandedTapTargetSize);
+           (otherData.materialTapTargetSize == materialTapTargetSize);
   }
 
   @override
@@ -793,7 +805,7 @@ class ThemeData extends Diagnosticable {
         sliderTheme,
         chipTheme,
         platform,
-        expandedTapTargetSize
+        materialTapTargetSize
       ),
     );
   }
@@ -838,7 +850,7 @@ class ThemeData extends Diagnosticable {
     properties.add(new DiagnosticsProperty<IconThemeData>('accentIconTheme', accentIconTheme));
     properties.add(new DiagnosticsProperty<SliderThemeData>('sliderTheme', sliderTheme));
     properties.add(new DiagnosticsProperty<ChipThemeData>('chipTheme', chipTheme));
-    properties.add(new DiagnosticsProperty<bool>('expandedTapTargetSize', expandedTapTargetSize));
+    properties.add(new DiagnosticsProperty<MaterialTapTargetSize>('materialTapTargetSize', materialTapTargetSize));
   }
 }
 
diff --git a/packages/flutter/test/material/theme_data_test.dart b/packages/flutter/test/material/theme_data_test.dart
index edc87e043e228..0392cd885a39d 100644
--- a/packages/flutter/test/material/theme_data_test.dart
+++ b/packages/flutter/test/material/theme_data_test.dart
@@ -103,10 +103,10 @@ void main() {
     expect(darkTheme.accentTextTheme.title.color, typography.white.title.color);
   });
 
-  test('Defaults to expandedTapTargetSize', () {
+  test('Defaults to MaterialTapTargetBehavior.expanded', () {
     final ThemeData themeData = new ThemeData();
 
-    expect(themeData.expandedTapTargetSize, true);
+    expect(themeData.materialTapTargetSize, MaterialTapTargetSize.expanded);
   });
 
   test('Can control fontFamily', () {

From 7bb9ff9a7c68101c0511f7e9d38d750f06a9d80a Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Mon, 11 Jun 2018 13:40:20 -0700
Subject: [PATCH 17/33] merge material button tap target changes adjusted to
 use new flag

---
 packages/flutter/lib/src/material/button.dart     |  5 ++++-
 .../flutter/lib/src/material/flat_button.dart     |  5 ++++-
 .../lib/src/material/floating_action_button.dart  |  7 ++++++-
 .../flutter/lib/src/material/raised_button.dart   |  5 ++++-
 packages/flutter/lib/src/material/theme_data.dart | 11 ++++++++++-
 .../flutter/lib/src/material/time_picker.dart     | 15 +++++++++++++--
 .../test/material/outline_button_test.dart        |  8 ++++----
 7 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/packages/flutter/lib/src/material/button.dart b/packages/flutter/lib/src/material/button.dart
index 894ef90bb4633..8c03633ac631d 100644
--- a/packages/flutter/lib/src/material/button.dart
+++ b/packages/flutter/lib/src/material/button.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
 import 'button_theme.dart';
@@ -416,7 +417,9 @@ class MaterialButton extends StatelessWidget {
       ),
       shape: buttonTheme.shape,
       child: child,
-      outerConstraints: const BoxConstraints(minHeight: 48.0),
+      outerConstraints: theme.materialTapTargetSize == MaterialTapTargetSize.expanded
+        ? const BoxConstraints(minHeight: 48.0)
+        : null,
     );
   }
 
diff --git a/packages/flutter/lib/src/material/flat_button.dart b/packages/flutter/lib/src/material/flat_button.dart
index 614e4cb7d6e15..953859085f248 100644
--- a/packages/flutter/lib/src/material/flat_button.dart
+++ b/packages/flutter/lib/src/material/flat_button.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
 import 'button.dart';
@@ -290,7 +291,9 @@ class FlatButton extends StatelessWidget {
       splashColor: _getSplashColor(theme, buttonTheme),
       elevation: 0.0,
       highlightElevation: 0.0,
-      outerConstraints: const BoxConstraints(minHeight: 48.0),
+      outerConstraints: theme.materialTapTargetSize == MaterialTapTargetSize.expanded
+        ? const BoxConstraints(minHeight: 48.0)
+        : null,
       padding: padding ?? buttonTheme.padding,
       constraints: buttonTheme.constraints,
       shape: shape ?? buttonTheme.shape,
diff --git a/packages/flutter/lib/src/material/floating_action_button.dart b/packages/flutter/lib/src/material/floating_action_button.dart
index c7d0b9751193a..0319a013b9344 100644
--- a/packages/flutter/lib/src/material/floating_action_button.dart
+++ b/packages/flutter/lib/src/material/floating_action_button.dart
@@ -4,6 +4,7 @@
 
 import 'dart:math' as math;
 
+import 'package:flutter/material.dart';
 import 'package:flutter/painting.dart';
 import 'package:flutter/widgets.dart';
 
@@ -263,12 +264,16 @@ class _FloatingActionButtonState extends State<FloatingActionButton> {
       result = widget.child != null ? tooltip : new SizedBox.expand(child: tooltip);
     }
 
+    final BoxConstraints outerConstraints = (widget.mini && theme.materialTapTargetSize == MaterialTapTargetSize.expanded)
+      ? const BoxConstraints(minHeight: 48.0, minWidth: 48.0)
+      : null;
+
     result = new RawMaterialButton(
       onPressed: widget.onPressed,
       onHighlightChanged: _handleHighlightChanged,
       elevation: _highlight ? widget.highlightElevation : widget.elevation,
       constraints: widget._sizeConstraints,
-      outerConstraints: widget.mini ? const BoxConstraints(minHeight: 48.0, minWidth: 48.0) : null,
+      outerConstraints: outerConstraints,
       fillColor: widget.backgroundColor ?? theme.accentColor,
       textStyle: theme.accentTextTheme.button.copyWith(
         color: foregroundColor,
diff --git a/packages/flutter/lib/src/material/raised_button.dart b/packages/flutter/lib/src/material/raised_button.dart
index f6969260c6be4..8b4305d790b26 100644
--- a/packages/flutter/lib/src/material/raised_button.dart
+++ b/packages/flutter/lib/src/material/raised_button.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
 import 'button.dart';
@@ -380,7 +381,9 @@ class RaisedButton extends StatelessWidget {
       shape: shape ?? buttonTheme.shape,
       animationDuration: animationDuration,
       child: child,
-      outerConstraints: const BoxConstraints(minHeight: 48.0),
+      outerConstraints: theme.materialTapTargetSize == MaterialTapTargetSize.expanded
+        ? const BoxConstraints(minHeight: 48.0)
+        : null,
     );
   }
 
diff --git a/packages/flutter/lib/src/material/theme_data.dart b/packages/flutter/lib/src/material/theme_data.dart
index 65a16cc9996fc..29d1903297476 100644
--- a/packages/flutter/lib/src/material/theme_data.dart
+++ b/packages/flutter/lib/src/material/theme_data.dart
@@ -36,7 +36,16 @@ const Color _kLightThemeSplashColor = const Color(0x66C8C8C8);
 const Color _kDarkThemeHighlightColor = const Color(0x40CCCCCC);
 const Color _kDarkThemeSplashColor = const Color(0x40CCCCCC);
 
-/// Configures the tap target size of certain Material widgets.
+/// Configures the tap target and layout size of certain Material widgets.
+///
+/// The following widgets are impacted:
+///
+///   * [FloatingActionButton], only the mini tap target size is increased.
+///   * [MaterialButton]
+///   * [OutlineButton]
+///   * [FlatButton]
+///   * [TimePicker]
+///   * [SnackBar]
 enum MaterialTapTargetSize {
   /// Expands the minimum tap target size to 48dp by 48dp.
   ///
diff --git a/packages/flutter/lib/src/material/time_picker.dart b/packages/flutter/lib/src/material/time_picker.dart
index c3a8e32c590ff..5caa4a1523236 100644
--- a/packages/flutter/lib/src/material/time_picker.dart
+++ b/packages/flutter/lib/src/material/time_picker.dart
@@ -5,6 +5,7 @@
 import 'dart:async';
 import 'dart:math' as math;
 
+import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
@@ -29,12 +30,16 @@ enum _TimePickerMode { hour, minute }
 const double _kTimePickerHeaderPortraitHeight = 96.0;
 const double _kTimePickerHeaderLandscapeWidth = 168.0;
 
+
 const double _kTimePickerWidthPortrait = 328.0;
 const double _kTimePickerWidthLandscape = 512.0;
 
 const double _kTimePickerHeightPortrait = 496.0;
 const double _kTimePickerHeightLandscape = 316.0;
 
+const double _kTimePickerHeightPortraitColaped = 484.0;
+const double _kTimePickerHeightLandscapeColapsed = 304.0;
+
 /// The horizontal gap between the day period fragment and the fragment
 /// positioned next to it horizontally.
 ///
@@ -1578,9 +1583,12 @@ class _TimePickerDialogState extends State<_TimePickerDialog> {
           assert(orientation != null);
           switch (orientation) {
             case Orientation.portrait:
+              final double timePickerHeightPortrait = theme.materialTapTargetSize == MaterialTapTargetSize.expanded
+                  ? _kTimePickerHeightPortrait
+                  : _kTimePickerHeightPortraitColaped;
               return new SizedBox(
                 width: _kTimePickerWidthPortrait,
-                height: _kTimePickerHeightPortrait,
+                height: timePickerHeightPortrait,
                 child: new Column(
                   mainAxisSize: MainAxisSize.min,
                   crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -1593,9 +1601,12 @@ class _TimePickerDialogState extends State<_TimePickerDialog> {
                 )
               );
             case Orientation.landscape:
+              final double timePickerHeightLandscape = theme.materialTapTargetSize == MaterialTapTargetSize.expanded
+                  ? _kTimePickerHeightLandscape
+                  : _kTimePickerHeightLandscapeColapsed;
               return new SizedBox(
                 width: _kTimePickerWidthLandscape,
-                height: _kTimePickerHeightLandscape,
+                height: timePickerHeightLandscape,
                 child: new Row(
                   mainAxisSize: MainAxisSize.min,
                   crossAxisAlignment: CrossAxisAlignment.stretch,
diff --git a/packages/flutter/test/material/outline_button_test.dart b/packages/flutter/test/material/outline_button_test.dart
index 6bfb849a46df7..c1cdea80bb751 100644
--- a/packages/flutter/test/material/outline_button_test.dart
+++ b/packages/flutter/test/material/outline_button_test.dart
@@ -55,7 +55,7 @@ void main() {
       new Directionality(
         textDirection: TextDirection.ltr,
         child: new Theme(
-          data: new ThemeData(),
+          data: new ThemeData(materialTapTargetSize: MaterialTapTargetSize.collapsed),
           child: new Container(
             alignment: Alignment.topLeft,
             child: new OutlineButton(
@@ -77,8 +77,8 @@ void main() {
     final Finder outlineButton = find.byType(OutlineButton);
     expect(tester.widget<OutlineButton>(outlineButton).enabled, true);
 
-    final Rect clipRect = new Rect.fromLTRB(0.0, 6.0, 116.0, 42.0);
-    final Path clipPath = new Path()..addRect(clipRect.inflate(10.0));
+    final Rect clipRect = new Rect.fromLTRB(0.0, 0.0, 116.0, 36.0);
+    final Path clipPath = new Path()..addRect(clipRect);
     expect(
       outlineButton,
       paints
@@ -113,7 +113,7 @@ void main() {
         ..path(color: borderColor, strokeWidth: borderWidth)
     );
     debugDisableShadows = true;
-  }, skip: true);
+  });
 
 
   testWidgets('OutlineButton contributes semantics', (WidgetTester tester) async {

From e0b1f28d1264208ccf265e338e8f57ca3f760e41 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Mon, 11 Jun 2018 14:06:39 -0700
Subject: [PATCH 18/33] fix imports and remove public outerConstraints property
 of chip

---
 packages/flutter/lib/src/material/button.dart |  2 +-
 packages/flutter/lib/src/material/chip.dart   | 74 ++++++-------------
 .../flutter/lib/src/material/flat_button.dart |  2 +-
 .../src/material/floating_action_button.dart  |  2 +-
 .../lib/src/material/raised_button.dart       |  5 +-
 .../flutter/lib/src/material/time_picker.dart |  2 +-
 6 files changed, 28 insertions(+), 59 deletions(-)

diff --git a/packages/flutter/lib/src/material/button.dart b/packages/flutter/lib/src/material/button.dart
index 8c03633ac631d..2471e32d14a8e 100644
--- a/packages/flutter/lib/src/material/button.dart
+++ b/packages/flutter/lib/src/material/button.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
 import 'button_theme.dart';
@@ -12,6 +11,7 @@ import 'constants.dart';
 import 'ink_well.dart';
 import 'material.dart';
 import 'theme.dart';
+import 'theme_data.dart';
 
 /// Creates a button based on [Semantics], [Material], and [InkWell]
 /// widgets.
diff --git a/packages/flutter/lib/src/material/chip.dart b/packages/flutter/lib/src/material/chip.dart
index 2306099e115f6..b1f337a13aa9a 100644
--- a/packages/flutter/lib/src/material/chip.dart
+++ b/packages/flutter/lib/src/material/chip.dart
@@ -17,6 +17,7 @@ import 'ink_well.dart';
 import 'material.dart';
 import 'material_localizations.dart';
 import 'theme.dart';
+import 'theme_data.dart';
 import 'tooltip.dart';
 
 // Some design constants
@@ -38,8 +39,6 @@ const Duration _kDisableDuration = const Duration(milliseconds: 75);
 const Color _kSelectScrimColor = const Color(0x60191919);
 const Icon _kDefaultDeleteIcon = const Icon(Icons.cancel, size: _kDeleteIconSize);
 
-const BoxConstraints _kDefaultOuterConstraints = const BoxConstraints(minWidth: 48.0, minHeight: 48.0);
-
 /// An interface defining the base attributes for a material design chip.
 ///
 /// Chips are compact elements that represent an attribute, text, entity, or
@@ -101,13 +100,6 @@ abstract class ChipAttributes {
   /// By default, this is 4 logical pixels at the beginning and the end of the
   /// label, and zero on top and bottom.
   EdgeInsetsGeometry get labelPadding;
-
-  /// Constraints used to increase the gesture detector size without increasing
-  /// the visible material of the chip.
-  ///
-  /// Defaults to 48 dp minimum width and 48 dp minimum height. Passing null
-  /// removes the outer gesture detector.
-  BoxConstraints get outerConstraints;
 }
 
 /// An interface for material design chips that can be deleted.
@@ -432,7 +424,6 @@ class Chip extends StatelessWidget implements ChipAttributes, DeletableChipAttri
     this.shape,
     this.backgroundColor,
     this.padding,
-    this.outerConstraints = _kDefaultOuterConstraints,
   })  : assert(label != null),
         super(key: key);
 
@@ -458,8 +449,6 @@ class Chip extends StatelessWidget implements ChipAttributes, DeletableChipAttri
   final Color deleteIconColor;
   @override
   final String deleteButtonTooltipMessage;
-  @override
-  final BoxConstraints outerConstraints;
 
   @override
   Widget build(BuildContext context) {
@@ -478,7 +467,6 @@ class Chip extends StatelessWidget implements ChipAttributes, DeletableChipAttri
       backgroundColor: backgroundColor,
       padding: padding,
       isEnabled: true,
-      outerConstraints: outerConstraints,
     );
   }
 }
@@ -560,7 +548,6 @@ class InputChip extends StatelessWidget
     this.shape,
     this.backgroundColor,
     this.padding,
-    this.outerConstraints = _kDefaultOuterConstraints,
   })  : assert(selected != null),
         assert(isEnabled != null),
         assert(label != null),
@@ -602,8 +589,6 @@ class InputChip extends StatelessWidget
   final Color backgroundColor;
   @override
   final EdgeInsetsGeometry padding;
-  @override
-  final BoxConstraints outerConstraints;
 
   @override
   Widget build(BuildContext context) {
@@ -627,7 +612,6 @@ class InputChip extends StatelessWidget
       shape: shape,
       backgroundColor: backgroundColor,
       padding: padding,
-      outerConstraints: outerConstraints,
       isEnabled: isEnabled && (onSelected != null || onDeleted != null || onPressed != null),
     );
   }
@@ -706,7 +690,6 @@ class ChoiceChip extends StatelessWidget
     this.shape,
     this.backgroundColor,
     this.padding,
-    this.outerConstraints = _kDefaultOuterConstraints,
   })  : assert(selected != null),
         assert(label != null),
         super(key: key);
@@ -735,8 +718,6 @@ class ChoiceChip extends StatelessWidget
   final Color backgroundColor;
   @override
   final EdgeInsetsGeometry padding;
-  @override
-  final BoxConstraints outerConstraints;
 
   @override
   bool get isEnabled => onSelected != null;
@@ -761,7 +742,6 @@ class ChoiceChip extends StatelessWidget
       backgroundColor: backgroundColor,
       padding: padding,
       isEnabled: isEnabled,
-      outerConstraints: outerConstraints,
     );
   }
 }
@@ -873,7 +853,6 @@ class FilterChip extends StatelessWidget
     this.shape,
     this.backgroundColor,
     this.padding,
-    this.outerConstraints = _kDefaultOuterConstraints,
   })  : assert(selected != null),
         assert(label != null),
         super(key: key);
@@ -902,8 +881,6 @@ class FilterChip extends StatelessWidget
   final Color backgroundColor;
   @override
   final EdgeInsetsGeometry padding;
-  @override
-  final BoxConstraints outerConstraints;
 
   @override
   bool get isEnabled => onSelected != null;
@@ -925,7 +902,6 @@ class FilterChip extends StatelessWidget
       selectedColor: selectedColor,
       padding: padding,
       isEnabled: isEnabled,
-      outerConstraints: outerConstraints,
     );
   }
 }
@@ -991,7 +967,6 @@ class ActionChip extends StatelessWidget implements ChipAttributes, TappableChip
     this.shape,
     this.backgroundColor,
     this.padding,
-    this.outerConstraints = _kDefaultOuterConstraints,
   })  : assert(label != null),
         assert(
           onPressed != null,
@@ -1018,8 +993,6 @@ class ActionChip extends StatelessWidget implements ChipAttributes, TappableChip
   final Color backgroundColor;
   @override
   final EdgeInsetsGeometry padding;
-  @override
-  final BoxConstraints outerConstraints;
 
   @override
   Widget build(BuildContext context) {
@@ -1035,7 +1008,6 @@ class ActionChip extends StatelessWidget implements ChipAttributes, TappableChip
       padding: padding,
       labelPadding: labelPadding,
       isEnabled: true,
-      outerConstraints: outerConstraints,
     );
   }
 }
@@ -1105,7 +1077,6 @@ class RawChip extends StatefulWidget
     this.tooltip,
     this.shape,
     this.backgroundColor,
-    this.outerConstraints = _kDefaultOuterConstraints,
   })  : assert(label != null),
         assert(isEnabled != null),
         deleteIcon = deleteIcon ?? _kDefaultDeleteIcon,
@@ -1147,8 +1118,6 @@ class RawChip extends StatefulWidget
   final Color backgroundColor;
   @override
   final EdgeInsetsGeometry padding;
-  @override
-  final BoxConstraints outerConstraints;
 
   /// Whether or not to show a check mark when [selected] is true.
   ///
@@ -1463,26 +1432,29 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
         ),
       ),
     );
-    if (widget.outerConstraints != null) {
-      result = new ConstrainedBox(
-        constraints: widget.outerConstraints,
-        child: new Center(
-          child: result,
-          widthFactor: 1.0,
-          heightFactor: 1.0,
-        ),
-      );
-
-      if (canTap) {
-        result = new GestureDetector(
-          behavior: HitTestBehavior.translucent,
-          onTap: _handleTap,
-          onTapDown: _handleTapDown,
-          onTapCancel: _handleTapCancel,
-          child: result,
-          excludeFromSemantics: true,
+    switch(theme.materialTapTargetSize) {
+      case MaterialTapTargetSize.expanded:
+        result = new ConstrainedBox(
+          constraints: const BoxConstraints(minWidth: 48.0, minHeight: 48.0),
+          child: new Center(
+            child: result,
+            widthFactor: 1.0,
+            heightFactor: 1.0,
+          ),
         );
-      }
+
+        if (canTap) {
+          result = new GestureDetector(
+            behavior: HitTestBehavior.translucent,
+            onTap: _handleTap,
+            onTapDown: _handleTapDown,
+            onTapCancel: _handleTapCancel,
+            child: result,
+            excludeFromSemantics: true,
+          );
+        }
+        break;
+      case MaterialTapTargetSize.collapsed:
     }
 
     return new Semantics(
diff --git a/packages/flutter/lib/src/material/flat_button.dart b/packages/flutter/lib/src/material/flat_button.dart
index 953859085f248..6c312223e18ad 100644
--- a/packages/flutter/lib/src/material/flat_button.dart
+++ b/packages/flutter/lib/src/material/flat_button.dart
@@ -3,13 +3,13 @@
 // found in the LICENSE file.
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
 import 'button.dart';
 import 'button_theme.dart';
 import 'colors.dart';
 import 'theme.dart';
+import 'theme_data.dart';
 
 /// A material design "flat button".
 ///
diff --git a/packages/flutter/lib/src/material/floating_action_button.dart b/packages/flutter/lib/src/material/floating_action_button.dart
index 0319a013b9344..a0fe35f729174 100644
--- a/packages/flutter/lib/src/material/floating_action_button.dart
+++ b/packages/flutter/lib/src/material/floating_action_button.dart
@@ -4,13 +4,13 @@
 
 import 'dart:math' as math;
 
-import 'package:flutter/material.dart';
 import 'package:flutter/painting.dart';
 import 'package:flutter/widgets.dart';
 
 import 'button.dart';
 import 'scaffold.dart';
 import 'theme.dart';
+import 'theme_data.dart';
 import 'tooltip.dart';
 
 const BoxConstraints _kSizeConstraints = const BoxConstraints.tightFor(
diff --git a/packages/flutter/lib/src/material/raised_button.dart b/packages/flutter/lib/src/material/raised_button.dart
index 8b4305d790b26..8825864d1f43a 100644
--- a/packages/flutter/lib/src/material/raised_button.dart
+++ b/packages/flutter/lib/src/material/raised_button.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
 import 'button.dart';
@@ -11,6 +10,7 @@ import 'button_theme.dart';
 import 'colors.dart';
 import 'constants.dart';
 import 'theme.dart';
+import 'theme_data.dart';
 
 /// A material design "raised button".
 ///
@@ -381,9 +381,6 @@ class RaisedButton extends StatelessWidget {
       shape: shape ?? buttonTheme.shape,
       animationDuration: animationDuration,
       child: child,
-      outerConstraints: theme.materialTapTargetSize == MaterialTapTargetSize.expanded
-        ? const BoxConstraints(minHeight: 48.0)
-        : null,
     );
   }
 
diff --git a/packages/flutter/lib/src/material/time_picker.dart b/packages/flutter/lib/src/material/time_picker.dart
index 5caa4a1523236..b3dbb243088cd 100644
--- a/packages/flutter/lib/src/material/time_picker.dart
+++ b/packages/flutter/lib/src/material/time_picker.dart
@@ -5,7 +5,6 @@
 import 'dart:async';
 import 'dart:math' as math;
 
-import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
@@ -18,6 +17,7 @@ import 'feedback.dart';
 import 'flat_button.dart';
 import 'material_localizations.dart';
 import 'theme.dart';
+import 'theme_data.dart';
 import 'time.dart';
 import 'typography.dart';
 

From 440c96290b491af7ac4532d680b66f267c9f46b5 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Mon, 11 Jun 2018 14:29:36 -0700
Subject: [PATCH 19/33] address comments

---
 packages/flutter/lib/src/material/button.dart       | 12 +++++++++---
 packages/flutter/lib/src/material/chip.dart         |  6 +++---
 packages/flutter/lib/src/material/flat_button.dart  | 12 +++++++++---
 .../lib/src/material/floating_action_button.dart    | 13 +++++++++----
 .../flutter/lib/src/material/raised_button.dart     |  9 +++++++++
 packages/flutter/lib/src/material/theme_data.dart   | 11 +++++++++--
 packages/flutter/test/material/buttons_test.dart    |  8 ++++++--
 7 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/packages/flutter/lib/src/material/button.dart b/packages/flutter/lib/src/material/button.dart
index 2471e32d14a8e..ee51a73b1cf26 100644
--- a/packages/flutter/lib/src/material/button.dart
+++ b/packages/flutter/lib/src/material/button.dart
@@ -401,6 +401,14 @@ class MaterialButton extends StatelessWidget {
     final ThemeData theme = Theme.of(context);
     final ButtonThemeData buttonTheme = ButtonTheme.of(context);
     final Color textColor = _getTextColor(theme, buttonTheme, color);
+    BoxConstraints outerConstraints;
+    switch (theme.materialTapTargetSize) {
+      case MaterialTapTargetSize.expanded:
+        outerConstraints = const BoxConstraints(minHeight: 48.0, minWidth: 48.0);
+        break;
+      case MaterialTapTargetSize.collapsed:
+        break;
+    }
 
     return new RawMaterialButton(
       onPressed: onPressed,
@@ -417,9 +425,7 @@ class MaterialButton extends StatelessWidget {
       ),
       shape: buttonTheme.shape,
       child: child,
-      outerConstraints: theme.materialTapTargetSize == MaterialTapTargetSize.expanded
-        ? const BoxConstraints(minHeight: 48.0)
-        : null,
+      outerConstraints: outerConstraints,
     );
   }
 
diff --git a/packages/flutter/lib/src/material/chip.dart b/packages/flutter/lib/src/material/chip.dart
index b1f337a13aa9a..8c38f0be73dcc 100644
--- a/packages/flutter/lib/src/material/chip.dart
+++ b/packages/flutter/lib/src/material/chip.dart
@@ -46,7 +46,7 @@ const Icon _kDefaultDeleteIcon = const Icon(Icons.cancel, size: _kDeleteIconSize
 ///
 /// The defaults mentioned in the documentation for each attribute are what
 /// the implementing classes typically use for defaults (but this class doesn't
-/// provide or enforce them).f
+/// provide or enforce them).
 ///
 /// See also:
 ///
@@ -1432,7 +1432,7 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
         ),
       ),
     );
-    switch(theme.materialTapTargetSize) {
+    switch (theme.materialTapTargetSize) {
       case MaterialTapTargetSize.expanded:
         result = new ConstrainedBox(
           constraints: const BoxConstraints(minWidth: 48.0, minHeight: 48.0),
@@ -1442,7 +1442,6 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
             heightFactor: 1.0,
           ),
         );
-
         if (canTap) {
           result = new GestureDetector(
             behavior: HitTestBehavior.translucent,
@@ -1455,6 +1454,7 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
         }
         break;
       case MaterialTapTargetSize.collapsed:
+        break;
     }
 
     return new Semantics(
diff --git a/packages/flutter/lib/src/material/flat_button.dart b/packages/flutter/lib/src/material/flat_button.dart
index 6c312223e18ad..b799ed4f8e53e 100644
--- a/packages/flutter/lib/src/material/flat_button.dart
+++ b/packages/flutter/lib/src/material/flat_button.dart
@@ -281,6 +281,14 @@ class FlatButton extends StatelessWidget {
     final ButtonThemeData buttonTheme = ButtonTheme.of(context);
     final Color fillColor = enabled ? color : disabledColor;
     final Color textColor = _getTextColor(theme, buttonTheme, fillColor);
+    BoxConstraints outerConstraints;
+    switch (theme.materialTapTargetSize) {
+      case MaterialTapTargetSize.expanded:
+        outerConstraints = const BoxConstraints(minHeight: 48.0, minWidth: 48.0);
+        break;
+      case MaterialTapTargetSize.collapsed:
+        break;
+    }
 
     return new RawMaterialButton(
       onPressed: onPressed,
@@ -291,9 +299,7 @@ class FlatButton extends StatelessWidget {
       splashColor: _getSplashColor(theme, buttonTheme),
       elevation: 0.0,
       highlightElevation: 0.0,
-      outerConstraints: theme.materialTapTargetSize == MaterialTapTargetSize.expanded
-        ? const BoxConstraints(minHeight: 48.0)
-        : null,
+      outerConstraints: outerConstraints,
       padding: padding ?? buttonTheme.padding,
       constraints: buttonTheme.constraints,
       shape: shape ?? buttonTheme.shape,
diff --git a/packages/flutter/lib/src/material/floating_action_button.dart b/packages/flutter/lib/src/material/floating_action_button.dart
index a0fe35f729174..cfe04f35a20ff 100644
--- a/packages/flutter/lib/src/material/floating_action_button.dart
+++ b/packages/flutter/lib/src/material/floating_action_button.dart
@@ -264,16 +264,21 @@ class _FloatingActionButtonState extends State<FloatingActionButton> {
       result = widget.child != null ? tooltip : new SizedBox.expand(child: tooltip);
     }
 
-    final BoxConstraints outerConstraints = (widget.mini && theme.materialTapTargetSize == MaterialTapTargetSize.expanded)
-      ? const BoxConstraints(minHeight: 48.0, minWidth: 48.0)
-      : null;
+    BoxConstraints outerConstraints;
+    switch (theme.materialTapTargetSize) {
+      case MaterialTapTargetSize.expanded:
+        outerConstraints = const BoxConstraints(minHeight: 48.0, minWidth: 48.0);
+        break;
+      case MaterialTapTargetSize.collapsed:
+        break;
+    }
 
     result = new RawMaterialButton(
       onPressed: widget.onPressed,
       onHighlightChanged: _handleHighlightChanged,
       elevation: _highlight ? widget.highlightElevation : widget.elevation,
       constraints: widget._sizeConstraints,
-      outerConstraints: outerConstraints,
+      outerConstraints: widget.mini ? outerConstraints : null,
       fillColor: widget.backgroundColor ?? theme.accentColor,
       textStyle: theme.accentTextTheme.button.copyWith(
         color: foregroundColor,
diff --git a/packages/flutter/lib/src/material/raised_button.dart b/packages/flutter/lib/src/material/raised_button.dart
index 8825864d1f43a..0f1c341323485 100644
--- a/packages/flutter/lib/src/material/raised_button.dart
+++ b/packages/flutter/lib/src/material/raised_button.dart
@@ -365,6 +365,14 @@ class RaisedButton extends StatelessWidget {
     final ButtonThemeData buttonTheme = ButtonTheme.of(context);
     final Color fillColor = _getFillColor(theme, buttonTheme);
     final Color textColor = _getTextColor(theme, buttonTheme, fillColor);
+    BoxConstraints outerConstraints;
+    switch (theme.materialTapTargetSize) {
+      case MaterialTapTargetSize.expanded:
+        outerConstraints = const BoxConstraints(minHeight: 48.0, minWidth: 48.0);
+        break;
+      case MaterialTapTargetSize.collapsed:
+        break;
+    }
 
     return new RawMaterialButton(
       onPressed: onPressed,
@@ -381,6 +389,7 @@ class RaisedButton extends StatelessWidget {
       shape: shape ?? buttonTheme.shape,
       animationDuration: animationDuration,
       child: child,
+      outerConstraints: outerConstraints
     );
   }
 
diff --git a/packages/flutter/lib/src/material/theme_data.dart b/packages/flutter/lib/src/material/theme_data.dart
index 29d1903297476..8d0e8bc36e97b 100644
--- a/packages/flutter/lib/src/material/theme_data.dart
+++ b/packages/flutter/lib/src/material/theme_data.dart
@@ -38,16 +38,23 @@ const Color _kDarkThemeSplashColor = const Color(0x40CCCCCC);
 
 /// Configures the tap target and layout size of certain Material widgets.
 ///
-/// The following widgets are impacted:
+/// Some of the impacted widgets include:
 ///
 ///   * [FloatingActionButton], only the mini tap target size is increased.
 ///   * [MaterialButton]
 ///   * [OutlineButton]
 ///   * [FlatButton]
+///   * [RaisedButton]
 ///   * [TimePicker]
 ///   * [SnackBar]
+///   * [Chip]
+///   * [RawChip]
+///   * [InputChip]
+///   * [ChoiceChip]
+///   * [FilterChip]
+///   * [ActionChip]
 enum MaterialTapTargetSize {
-  /// Expands the minimum tap target size to 48dp by 48dp.
+  /// Expands the minimum tap target size to 48px by 48px.
   ///
   /// This is the default value of [ThemeData.materialHitTestSize] and the
   /// recommended behavior to conform to Android accessibility recommendations.
diff --git a/packages/flutter/test/material/buttons_test.dart b/packages/flutter/test/material/buttons_test.dart
index f4b6b6880d59b..44bfae2a67eba 100644
--- a/packages/flutter/test/material/buttons_test.dart
+++ b/packages/flutter/test/material/buttons_test.dart
@@ -187,7 +187,9 @@ void main() {
       new Directionality(
         textDirection: TextDirection.ltr,
         child: new Theme(
-          data: new ThemeData(),
+          data: new ThemeData(
+            materialTapTargetSize: MaterialTapTargetSize.collapsed,
+          ),
           child: buttonWidget,
         ),
       ),
@@ -233,6 +235,7 @@ void main() {
           data: new ThemeData(
             highlightColor: themeHighlightColor1,
             splashColor: themeSplashColor1,
+            materialTapTargetSize: MaterialTapTargetSize.collapsed,
           ),
           child: buttonWidget,
         ),
@@ -260,6 +263,7 @@ void main() {
           data: new ThemeData(
             highlightColor: themeHighlightColor2,
             splashColor: themeSplashColor2,
+            materialTapTargetSize: MaterialTapTargetSize.collapsed,
           ),
           child: buttonWidget, // same widget, so does not get updated because of us
         ),
@@ -274,7 +278,7 @@ void main() {
     );
 
     await gesture.up();
-  }, skip: true);
+  });
 
   testWidgets('Disabled MaterialButton has same semantic size as enabled and exposes disabled semantics', (WidgetTester tester) async {
     final SemanticsTester semantics = new SemanticsTester(tester);

From a90b986a0c96b08d6c259b6479c795d8b512358c Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Mon, 11 Jun 2018 14:33:36 -0700
Subject: [PATCH 20/33] fix spelling and add switch statement in time picker

---
 .../flutter/lib/src/material/time_picker.dart | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/packages/flutter/lib/src/material/time_picker.dart b/packages/flutter/lib/src/material/time_picker.dart
index b3dbb243088cd..59666cf395507 100644
--- a/packages/flutter/lib/src/material/time_picker.dart
+++ b/packages/flutter/lib/src/material/time_picker.dart
@@ -37,8 +37,8 @@ const double _kTimePickerWidthLandscape = 512.0;
 const double _kTimePickerHeightPortrait = 496.0;
 const double _kTimePickerHeightLandscape = 316.0;
 
-const double _kTimePickerHeightPortraitColaped = 484.0;
-const double _kTimePickerHeightLandscapeColapsed = 304.0;
+const double _kTimePickerHeightPortraitCollapsed = 484.0;
+const double _kTimePickerHeightLandscapeCollapsed = 304.0;
 
 /// The horizontal gap between the day period fragment and the fragment
 /// positioned next to it horizontally.
@@ -1580,12 +1580,22 @@ class _TimePickerDialogState extends State<_TimePickerDialog> {
             ),
           );
 
+          double timePickerHeightPortrait;
+          double timePickerHeightLandscape;
+          switch (theme.materialTapTargetSize) {
+            case MaterialTapTargetSize.expanded:
+              timePickerHeightPortrait = _kTimePickerHeightPortrait;
+              timePickerHeightLandscape = _kTimePickerHeightLandscape;
+              break;
+            case MaterialTapTargetSize.collapsed:
+              timePickerHeightPortrait = _kTimePickerHeightPortraitCollapsed;
+              timePickerHeightLandscape = _kTimePickerHeightLandscapeCollapsed;
+              break;
+          }
+
           assert(orientation != null);
           switch (orientation) {
             case Orientation.portrait:
-              final double timePickerHeightPortrait = theme.materialTapTargetSize == MaterialTapTargetSize.expanded
-                  ? _kTimePickerHeightPortrait
-                  : _kTimePickerHeightPortraitColaped;
               return new SizedBox(
                 width: _kTimePickerWidthPortrait,
                 height: timePickerHeightPortrait,
@@ -1601,9 +1611,6 @@ class _TimePickerDialogState extends State<_TimePickerDialog> {
                 )
               );
             case Orientation.landscape:
-              final double timePickerHeightLandscape = theme.materialTapTargetSize == MaterialTapTargetSize.expanded
-                  ? _kTimePickerHeightLandscape
-                  : _kTimePickerHeightLandscapeColapsed;
               return new SizedBox(
                 width: _kTimePickerWidthLandscape,
                 height: timePickerHeightLandscape,

From dbf3daebc094405f5d5297c6c0135b06351ca7cd Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Mon, 11 Jun 2018 14:37:17 -0700
Subject: [PATCH 21/33] fix new wrapping in chip

---
 packages/flutter/lib/src/material/chip.dart | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/flutter/lib/src/material/chip.dart b/packages/flutter/lib/src/material/chip.dart
index 8c38f0be73dcc..99ecc7ae4b66c 100644
--- a/packages/flutter/lib/src/material/chip.dart
+++ b/packages/flutter/lib/src/material/chip.dart
@@ -1378,8 +1378,7 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
         onTapDown: canTap ? _handleTapDown : null,
         onTapCancel: canTap ? _handleTapCancel : null,
         child: new AnimatedBuilder(
-          animation: new Listenable.merge(
-              <Listenable>[selectController, enableController]),
+          animation: new Listenable.merge(<Listenable>[selectController, enableController]),
           builder: (BuildContext context, Widget child) {
             return new Container(
               decoration: new ShapeDecoration(
@@ -1413,10 +1412,8 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
                   switchInCurve: Curves.fastOutSlowIn,
                 ),
                 brightness: chipTheme.brightness,
-                padding: (widget.padding ?? chipTheme.padding).resolve(
-                    textDirection),
-                labelPadding: (widget.labelPadding ?? chipTheme.labelPadding)
-                    .resolve(textDirection),
+                padding: (widget.padding ?? chipTheme.padding).resolve(textDirection),
+                labelPadding: (widget.labelPadding ?? chipTheme.labelPadding).resolve(textDirection),
                 showAvatar: hasAvatar,
                 showCheckmark: widget.showCheckmark,
                 canTapBody: canTap,

From 53d3be62764b4e0a5e1816cd02c7050093ceb829 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Mon, 11 Jun 2018 15:54:10 -0700
Subject: [PATCH 22/33] update checkbox, radio, and switch to use
 additonalConstraints instead of size

---
 .../flutter/lib/src/material/checkbox.dart    | 19 ++++++++++-
 packages/flutter/lib/src/material/radio.dart  | 19 ++++++++++-
 packages/flutter/lib/src/material/switch.dart | 34 ++++++++++++++-----
 .../flutter/lib/src/material/theme_data.dart  |  3 ++
 .../flutter/lib/src/material/toggleable.dart  |  4 +--
 5 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/packages/flutter/lib/src/material/checkbox.dart b/packages/flutter/lib/src/material/checkbox.dart
index 6b9795ccd62a2..b3989fc7bdf36 100644
--- a/packages/flutter/lib/src/material/checkbox.dart
+++ b/packages/flutter/lib/src/material/checkbox.dart
@@ -10,6 +10,7 @@ import 'package:flutter/widgets.dart';
 import 'constants.dart';
 import 'debug.dart';
 import 'theme.dart';
+import 'theme_data.dart';
 import 'toggleable.dart';
 
 /// A material design checkbox.
@@ -125,12 +126,23 @@ class _CheckboxState extends State<Checkbox> with TickerProviderStateMixin {
   Widget build(BuildContext context) {
     assert(debugCheckHasMaterial(context));
     final ThemeData themeData = Theme.of(context);
+    Size size;
+    switch (themeData.materialTapTargetSize) {
+      case MaterialTapTargetSize.expanded:
+        size = const Size(2 * kRadialReactionRadius + 8.0, 2 * kRadialReactionRadius + 8.0);
+        break;
+      case MaterialTapTargetSize.collapsed:
+        size = const Size(2 * kRadialReactionRadius, 2 * kRadialReactionRadius);
+        break;
+    }
+    final BoxConstraints additionalConstraints = new BoxConstraints.tight(size);
     return new _CheckboxRenderObjectWidget(
       value: widget.value,
       tristate: widget.tristate,
       activeColor: widget.activeColor ?? themeData.toggleableActiveColor,
       inactiveColor: widget.onChanged != null ? themeData.unselectedWidgetColor : themeData.disabledColor,
       onChanged: widget.onChanged,
+      additionalConstraints: additionalConstraints,
       vsync: this,
     );
   }
@@ -145,6 +157,7 @@ class _CheckboxRenderObjectWidget extends LeafRenderObjectWidget {
     @required this.inactiveColor,
     @required this.onChanged,
     @required this.vsync,
+    @required this.additionalConstraints,
   }) : assert(tristate != null),
        assert(tristate || value != null),
        assert(activeColor != null),
@@ -158,6 +171,7 @@ class _CheckboxRenderObjectWidget extends LeafRenderObjectWidget {
   final Color inactiveColor;
   final ValueChanged<bool> onChanged;
   final TickerProvider vsync;
+  final BoxConstraints additionalConstraints;
 
   @override
   _RenderCheckbox createRenderObject(BuildContext context) => new _RenderCheckbox(
@@ -167,6 +181,7 @@ class _CheckboxRenderObjectWidget extends LeafRenderObjectWidget {
     inactiveColor: inactiveColor,
     onChanged: onChanged,
     vsync: vsync,
+    additionalConstraints: additionalConstraints,
   );
 
   @override
@@ -177,6 +192,7 @@ class _CheckboxRenderObjectWidget extends LeafRenderObjectWidget {
       ..activeColor = activeColor
       ..inactiveColor = inactiveColor
       ..onChanged = onChanged
+      ..additionalConstraints = additionalConstraints
       ..vsync = vsync;
   }
 }
@@ -191,6 +207,7 @@ class _RenderCheckbox extends RenderToggleable {
     bool tristate,
     Color activeColor,
     Color inactiveColor,
+    BoxConstraints additionalConstraints,
     ValueChanged<bool> onChanged,
     @required TickerProvider vsync,
   }): _oldValue = value,
@@ -200,7 +217,7 @@ class _RenderCheckbox extends RenderToggleable {
         activeColor: activeColor,
         inactiveColor: inactiveColor,
         onChanged: onChanged,
-        size: const Size(2 * kRadialReactionRadius + 8.0, 2 * kRadialReactionRadius + 8.0),
+        additionalConstraints: additionalConstraints,
         vsync: vsync,
       );
 
diff --git a/packages/flutter/lib/src/material/radio.dart b/packages/flutter/lib/src/material/radio.dart
index ad81f1f127709..b50b0872a32a1 100644
--- a/packages/flutter/lib/src/material/radio.dart
+++ b/packages/flutter/lib/src/material/radio.dart
@@ -8,6 +8,7 @@ import 'package:flutter/widgets.dart';
 import 'constants.dart';
 import 'debug.dart';
 import 'theme.dart';
+import 'theme_data.dart';
 import 'toggleable.dart';
 
 const double _kOuterRadius = 8.0;
@@ -116,11 +117,22 @@ class _RadioState<T> extends State<Radio<T>> with TickerProviderStateMixin {
   Widget build(BuildContext context) {
     assert(debugCheckHasMaterial(context));
     final ThemeData themeData = Theme.of(context);
+    Size size;
+    switch (themeData.materialTapTargetSize) {
+      case MaterialTapTargetSize.expanded:
+        size = const Size(2 * kRadialReactionRadius + 8.0, 2 * kRadialReactionRadius + 8.0);
+        break;
+      case MaterialTapTargetSize.collapsed:
+        size = const Size(2 * kRadialReactionRadius, 2 * kRadialReactionRadius);
+        break;
+    }
+    final BoxConstraints additionalConstraints = new BoxConstraints.tight(size);
     return new _RadioRenderObjectWidget(
       selected: widget.value == widget.groupValue,
       activeColor: widget.activeColor ?? themeData.toggleableActiveColor,
       inactiveColor: _getInactiveColor(themeData),
       onChanged: _enabled ? _handleChanged : null,
+      additionalConstraints: additionalConstraints,
       vsync: this,
     );
   }
@@ -132,6 +144,7 @@ class _RadioRenderObjectWidget extends LeafRenderObjectWidget {
     @required this.selected,
     @required this.activeColor,
     @required this.inactiveColor,
+    @required this.additionalConstraints,
     this.onChanged,
     @required this.vsync,
   }) : assert(selected != null),
@@ -145,6 +158,7 @@ class _RadioRenderObjectWidget extends LeafRenderObjectWidget {
   final Color activeColor;
   final ValueChanged<bool> onChanged;
   final TickerProvider vsync;
+  final BoxConstraints additionalConstraints;
 
   @override
   _RenderRadio createRenderObject(BuildContext context) => new _RenderRadio(
@@ -153,6 +167,7 @@ class _RadioRenderObjectWidget extends LeafRenderObjectWidget {
     inactiveColor: inactiveColor,
     onChanged: onChanged,
     vsync: vsync,
+    additionalConstraints: additionalConstraints,
   );
 
   @override
@@ -162,6 +177,7 @@ class _RadioRenderObjectWidget extends LeafRenderObjectWidget {
       ..activeColor = activeColor
       ..inactiveColor = inactiveColor
       ..onChanged = onChanged
+      ..additionalConstraints = additionalConstraints
       ..vsync = vsync;
   }
 }
@@ -172,6 +188,7 @@ class _RenderRadio extends RenderToggleable {
     Color activeColor,
     Color inactiveColor,
     ValueChanged<bool> onChanged,
+    BoxConstraints additionalConstraints,
     @required TickerProvider vsync,
   }): super(
     value: value,
@@ -179,7 +196,7 @@ class _RenderRadio extends RenderToggleable {
     activeColor: activeColor,
     inactiveColor: inactiveColor,
     onChanged: onChanged,
-    size: const Size(2 * kRadialReactionRadius + 8.0, 2 * kRadialReactionRadius + 8.0),
+    additionalConstraints: additionalConstraints,
     vsync: vsync,
   );
 
diff --git a/packages/flutter/lib/src/material/switch.dart b/packages/flutter/lib/src/material/switch.dart
index 8a70ba435b77a..7db7382f7f6b2 100644
--- a/packages/flutter/lib/src/material/switch.dart
+++ b/packages/flutter/lib/src/material/switch.dart
@@ -12,8 +12,17 @@ import 'constants.dart';
 import 'debug.dart';
 import 'shadows.dart';
 import 'theme.dart';
+import 'theme_data.dart';
 import 'toggleable.dart';
 
+const double _kTrackHeight = 14.0;
+const double _kTrackWidth = 33.0;
+const double _kTrackRadius = _kTrackHeight / 2.0;
+const double _kThumbRadius = 10.0;
+const double _kSwitchWidth = _kTrackWidth - 2 * _kTrackRadius + 2 * kRadialReactionRadius;
+const double _kSwitchHeight = 2 * kRadialReactionRadius + 8.0;
+const double _kSwitchHeightCollapsed = 2 * kRadialReactionRadius;
+
 /// A material design switch.
 ///
 /// Used to toggle the on/off state of a single setting.
@@ -142,6 +151,16 @@ class _SwitchState extends State<Switch> with TickerProviderStateMixin {
       inactiveThumbColor = widget.inactiveThumbColor ?? (isDark ? Colors.grey.shade800 : Colors.grey.shade400);
       inactiveTrackColor = widget.inactiveTrackColor ?? (isDark ? Colors.white10 : Colors.black12);
     }
+    Size size;
+    switch (themeData.materialTapTargetSize) {
+      case MaterialTapTargetSize.expanded:
+        size = const Size(_kSwitchWidth, _kSwitchHeight);
+        break;
+      case MaterialTapTargetSize.collapsed:
+        size = const Size(_kSwitchWidth, _kSwitchHeightCollapsed);
+        break;
+    }
+    final BoxConstraints additionalConstraints = new BoxConstraints.tight(size);
 
     return new _SwitchRenderObjectWidget(
       value: widget.value,
@@ -153,6 +172,7 @@ class _SwitchState extends State<Switch> with TickerProviderStateMixin {
       inactiveTrackColor: inactiveTrackColor,
       configuration: createLocalImageConfiguration(context),
       onChanged: widget.onChanged,
+      additionalConstraints: additionalConstraints,
       vsync: this,
     );
   }
@@ -171,6 +191,7 @@ class _SwitchRenderObjectWidget extends LeafRenderObjectWidget {
     this.configuration,
     this.onChanged,
     this.vsync,
+    this.additionalConstraints,
   }) : super(key: key);
 
   final bool value;
@@ -183,6 +204,7 @@ class _SwitchRenderObjectWidget extends LeafRenderObjectWidget {
   final ImageConfiguration configuration;
   final ValueChanged<bool> onChanged;
   final TickerProvider vsync;
+  final BoxConstraints additionalConstraints;
 
   @override
   _RenderSwitch createRenderObject(BuildContext context) {
@@ -197,6 +219,7 @@ class _SwitchRenderObjectWidget extends LeafRenderObjectWidget {
       configuration: configuration,
       onChanged: onChanged,
       textDirection: Directionality.of(context),
+      additionalConstraints: additionalConstraints,
       vsync: vsync,
     );
   }
@@ -214,17 +237,11 @@ class _SwitchRenderObjectWidget extends LeafRenderObjectWidget {
       ..configuration = configuration
       ..onChanged = onChanged
       ..textDirection = Directionality.of(context)
+      ..additionalConstraints = additionalConstraints
       ..vsync = vsync;
   }
 }
 
-const double _kTrackHeight = 14.0;
-const double _kTrackWidth = 33.0;
-const double _kTrackRadius = _kTrackHeight / 2.0;
-const double _kThumbRadius = 10.0;
-const double _kSwitchWidth = _kTrackWidth - 2 * _kTrackRadius + 2 * kRadialReactionRadius;
-const double _kSwitchHeight = 2 * kRadialReactionRadius + 8.0;
-
 class _RenderSwitch extends RenderToggleable {
   _RenderSwitch({
     bool value,
@@ -235,6 +252,7 @@ class _RenderSwitch extends RenderToggleable {
     Color activeTrackColor,
     Color inactiveTrackColor,
     ImageConfiguration configuration,
+    BoxConstraints additionalConstraints,
     @required TextDirection textDirection,
     ValueChanged<bool> onChanged,
     @required TickerProvider vsync,
@@ -251,7 +269,7 @@ class _RenderSwitch extends RenderToggleable {
          activeColor: activeColor,
          inactiveColor: inactiveColor,
          onChanged: onChanged,
-         size: const Size(_kSwitchWidth, _kSwitchHeight),
+         additionalConstraints: additionalConstraints,
          vsync: vsync,
        ) {
     _drag = new HorizontalDragGestureRecognizer()
diff --git a/packages/flutter/lib/src/material/theme_data.dart b/packages/flutter/lib/src/material/theme_data.dart
index 8d0e8bc36e97b..b083ac085d015 100644
--- a/packages/flutter/lib/src/material/theme_data.dart
+++ b/packages/flutter/lib/src/material/theme_data.dart
@@ -53,6 +53,9 @@ const Color _kDarkThemeSplashColor = const Color(0x40CCCCCC);
 ///   * [ChoiceChip]
 ///   * [FilterChip]
 ///   * [ActionChip]
+///   * [Radio]
+///   * [Switch]
+///   * [Checkbox]
 enum MaterialTapTargetSize {
   /// Expands the minimum tap target size to 48px by 48px.
   ///
diff --git a/packages/flutter/lib/src/material/toggleable.dart b/packages/flutter/lib/src/material/toggleable.dart
index 2a8831433b7ca..070928849d2db 100644
--- a/packages/flutter/lib/src/material/toggleable.dart
+++ b/packages/flutter/lib/src/material/toggleable.dart
@@ -26,10 +26,10 @@ abstract class RenderToggleable extends RenderConstrainedBox {
   RenderToggleable({
     @required bool value,
     bool tristate = false,
-    Size size,
     @required Color activeColor,
     @required Color inactiveColor,
     ValueChanged<bool> onChanged,
+    BoxConstraints additionalConstraints,
     @required TickerProvider vsync,
   }) : assert(tristate != null),
        assert(tristate || value != null),
@@ -42,7 +42,7 @@ abstract class RenderToggleable extends RenderConstrainedBox {
        _inactiveColor = inactiveColor,
        _onChanged = onChanged,
        _vsync = vsync,
-       super(additionalConstraints: new BoxConstraints.tight(size)) {
+       super(additionalConstraints: additionalConstraints) {
     _tap = new TapGestureRecognizer()
       ..onTapDown = _handleTapDown
       ..onTap = _handleTap

From 0e08fe82a1950e7b23d7687b39354d58d736be95 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Mon, 11 Jun 2018 16:05:42 -0700
Subject: [PATCH 23/33] Wrap CheckboxListTile, RadioListTile, and
 SwitchListTile in a collapsed theme

---
 .../lib/src/material/checkbox_list_tile.dart  | 29 +++++++++++--------
 .../lib/src/material/radio_list_tile.dart     | 29 +++++++++++--------
 .../lib/src/material/switch_list_tile.dart    | 29 +++++++++++--------
 3 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/packages/flutter/lib/src/material/checkbox_list_tile.dart b/packages/flutter/lib/src/material/checkbox_list_tile.dart
index d85d1e80065de..f708663e7d72a 100644
--- a/packages/flutter/lib/src/material/checkbox_list_tile.dart
+++ b/packages/flutter/lib/src/material/checkbox_list_tile.dart
@@ -7,6 +7,7 @@ import 'package:flutter/widgets.dart';
 import 'checkbox.dart';
 import 'list_tile.dart';
 import 'theme.dart';
+import 'theme_data.dart';
 
 /// A [ListTile] with a [Checkbox]. In other words, a checkbox with a label.
 ///
@@ -169,6 +170,7 @@ class CheckboxListTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final ThemeData themeData = Theme.of(context).copyWith(materialTapTargetSize: MaterialTapTargetSize.collapsed);
     final Widget control = new Checkbox(
       value: value,
       onChanged: onChanged,
@@ -187,18 +189,21 @@ class CheckboxListTile extends StatelessWidget {
         break;
     }
     return new MergeSemantics(
-      child: ListTileTheme.merge(
-        selectedColor: activeColor ?? Theme.of(context).accentColor,
-        child: new ListTile(
-          leading: leading,
-          title: title,
-          subtitle: subtitle,
-          trailing: trailing,
-          isThreeLine: isThreeLine,
-          dense: dense,
-          enabled: onChanged != null,
-          onTap: onChanged != null ? () { onChanged(!value); } : null,
-          selected: selected,
+      child: new Theme(
+        data: themeData,
+        child: ListTileTheme.merge(
+          selectedColor: activeColor ?? Theme.of(context).accentColor,
+          child: new ListTile(
+            leading: leading,
+            title: title,
+            subtitle: subtitle,
+            trailing: trailing,
+            isThreeLine: isThreeLine,
+            dense: dense,
+            enabled: onChanged != null,
+            onTap: onChanged != null ? () { onChanged(!value); } : null,
+            selected: selected,
+          ),
         ),
       ),
     );
diff --git a/packages/flutter/lib/src/material/radio_list_tile.dart b/packages/flutter/lib/src/material/radio_list_tile.dart
index 618c89020b8df..0154d2134341b 100644
--- a/packages/flutter/lib/src/material/radio_list_tile.dart
+++ b/packages/flutter/lib/src/material/radio_list_tile.dart
@@ -7,6 +7,7 @@ import 'package:flutter/widgets.dart';
 import 'list_tile.dart';
 import 'radio.dart';
 import 'theme.dart';
+import 'theme_data.dart';
 
 /// A [ListTile] with a [Radio]. In other words, a radio button with a label.
 ///
@@ -193,6 +194,7 @@ class RadioListTile<T> extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final ThemeData themeData = Theme.of(context).copyWith(materialTapTargetSize: MaterialTapTargetSize.collapsed);
     final Widget control = new Radio<T>(
       value: value,
       groupValue: groupValue,
@@ -212,18 +214,21 @@ class RadioListTile<T> extends StatelessWidget {
         break;
     }
     return new MergeSemantics(
-      child: ListTileTheme.merge(
-        selectedColor: activeColor ?? Theme.of(context).accentColor,
-        child: new ListTile(
-          leading: leading,
-          title: title,
-          subtitle: subtitle,
-          trailing: trailing,
-          isThreeLine: isThreeLine,
-          dense: dense,
-          enabled: onChanged != null,
-          onTap: onChanged != null ? () { onChanged(value); } : null,
-          selected: selected,
+      child: new Theme(
+        data: themeData,
+        child: ListTileTheme.merge(
+          selectedColor: activeColor ?? Theme.of(context).accentColor,
+          child: new ListTile(
+            leading: leading,
+            title: title,
+            subtitle: subtitle,
+            trailing: trailing,
+            isThreeLine: isThreeLine,
+            dense: dense,
+            enabled: onChanged != null,
+            onTap: onChanged != null ? () { onChanged(value); } : null,
+            selected: selected,
+          ),
         ),
       ),
     );
diff --git a/packages/flutter/lib/src/material/switch_list_tile.dart b/packages/flutter/lib/src/material/switch_list_tile.dart
index b9231803adcea..d519952ab8868 100644
--- a/packages/flutter/lib/src/material/switch_list_tile.dart
+++ b/packages/flutter/lib/src/material/switch_list_tile.dart
@@ -7,6 +7,7 @@ import 'package:flutter/widgets.dart';
 import 'list_tile.dart';
 import 'switch.dart';
 import 'theme.dart';
+import 'theme_data.dart';
 
 /// A [ListTile] with a [Switch]. In other words, a switch with a label.
 ///
@@ -165,6 +166,7 @@ class SwitchListTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final ThemeData themeData = Theme.of(context).copyWith(materialTapTargetSize: MaterialTapTargetSize.collapsed);
     final Widget control = new Switch(
       value: value,
       onChanged: onChanged,
@@ -173,18 +175,21 @@ class SwitchListTile extends StatelessWidget {
       inactiveThumbImage: inactiveThumbImage,
     );
     return new MergeSemantics(
-      child: ListTileTheme.merge(
-        selectedColor: activeColor ?? Theme.of(context).accentColor,
-        child: new ListTile(
-          leading: secondary,
-          title: title,
-          subtitle: subtitle,
-          trailing: control,
-          isThreeLine: isThreeLine,
-          dense: dense,
-          enabled: onChanged != null,
-          onTap: onChanged != null ? () { onChanged(!value); } : null,
-          selected: selected,
+      child: new Theme(
+        data: themeData,
+        child: ListTileTheme.merge(
+          selectedColor: activeColor ?? Theme.of(context).accentColor,
+          child: new ListTile(
+            leading: secondary,
+            title: title,
+            subtitle: subtitle,
+            trailing: control,
+            isThreeLine: isThreeLine,
+            dense: dense,
+            enabled: onChanged != null,
+            onTap: onChanged != null ? () { onChanged(!value); } : null,
+            selected: selected,
+          ),
         ),
       ),
     );

From 5fb4873ba4a50665c5a6493f66fbfb366f27dfa3 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Mon, 11 Jun 2018 16:46:58 -0700
Subject: [PATCH 24/33] renamed MaterialTapTargetSize enums and add size tests
 for Checkbox, Radio, and Switch

---
 packages/flutter/lib/src/material/button.dart |  4 +-
 .../flutter/lib/src/material/checkbox.dart    |  4 +-
 .../lib/src/material/checkbox_list_tile.dart  |  2 +-
 packages/flutter/lib/src/material/chip.dart   |  4 +-
 .../flutter/lib/src/material/flat_button.dart |  4 +-
 .../src/material/floating_action_button.dart  |  4 +-
 .../lib/src/material/input_border.dart        |  2 +-
 packages/flutter/lib/src/material/radio.dart  |  4 +-
 .../lib/src/material/radio_list_tile.dart     |  2 +-
 .../lib/src/material/raised_button.dart       |  4 +-
 packages/flutter/lib/src/material/switch.dart |  4 +-
 .../lib/src/material/switch_list_tile.dart    |  2 +-
 .../flutter/lib/src/material/theme_data.dart  | 14 ++++--
 .../flutter/lib/src/material/time_picker.dart |  4 +-
 .../flutter/test/material/buttons_test.dart   |  6 +--
 .../flutter/test/material/checkbox_test.dart  | 37 ++++++++++++---
 .../test/material/outline_button_test.dart    |  2 +-
 .../flutter/test/material/radio_test.dart     | 47 +++++++++++++++----
 .../flutter/test/material/switch_test.dart    | 40 ++++++++++++++++
 .../test/material/theme_data_test.dart        |  2 +-
 20 files changed, 144 insertions(+), 48 deletions(-)

diff --git a/packages/flutter/lib/src/material/button.dart b/packages/flutter/lib/src/material/button.dart
index ee51a73b1cf26..73f665a136975 100644
--- a/packages/flutter/lib/src/material/button.dart
+++ b/packages/flutter/lib/src/material/button.dart
@@ -403,10 +403,10 @@ class MaterialButton extends StatelessWidget {
     final Color textColor = _getTextColor(theme, buttonTheme, color);
     BoxConstraints outerConstraints;
     switch (theme.materialTapTargetSize) {
-      case MaterialTapTargetSize.expanded:
+      case MaterialTapTargetSize.padded:
         outerConstraints = const BoxConstraints(minHeight: 48.0, minWidth: 48.0);
         break;
-      case MaterialTapTargetSize.collapsed:
+      case MaterialTapTargetSize.shrinkWrap:
         break;
     }
 
diff --git a/packages/flutter/lib/src/material/checkbox.dart b/packages/flutter/lib/src/material/checkbox.dart
index b3989fc7bdf36..f7bddef334405 100644
--- a/packages/flutter/lib/src/material/checkbox.dart
+++ b/packages/flutter/lib/src/material/checkbox.dart
@@ -128,10 +128,10 @@ class _CheckboxState extends State<Checkbox> with TickerProviderStateMixin {
     final ThemeData themeData = Theme.of(context);
     Size size;
     switch (themeData.materialTapTargetSize) {
-      case MaterialTapTargetSize.expanded:
+      case MaterialTapTargetSize.padded:
         size = const Size(2 * kRadialReactionRadius + 8.0, 2 * kRadialReactionRadius + 8.0);
         break;
-      case MaterialTapTargetSize.collapsed:
+      case MaterialTapTargetSize.shrinkWrap:
         size = const Size(2 * kRadialReactionRadius, 2 * kRadialReactionRadius);
         break;
     }
diff --git a/packages/flutter/lib/src/material/checkbox_list_tile.dart b/packages/flutter/lib/src/material/checkbox_list_tile.dart
index f708663e7d72a..e1f4aed4632f8 100644
--- a/packages/flutter/lib/src/material/checkbox_list_tile.dart
+++ b/packages/flutter/lib/src/material/checkbox_list_tile.dart
@@ -170,7 +170,7 @@ class CheckboxListTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final ThemeData themeData = Theme.of(context).copyWith(materialTapTargetSize: MaterialTapTargetSize.collapsed);
+    final ThemeData themeData = Theme.of(context).copyWith(materialTapTargetSize: MaterialTapTargetSize.shrinkWrap);
     final Widget control = new Checkbox(
       value: value,
       onChanged: onChanged,
diff --git a/packages/flutter/lib/src/material/chip.dart b/packages/flutter/lib/src/material/chip.dart
index 99ecc7ae4b66c..5003dcb75c8dc 100644
--- a/packages/flutter/lib/src/material/chip.dart
+++ b/packages/flutter/lib/src/material/chip.dart
@@ -1430,7 +1430,7 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
       ),
     );
     switch (theme.materialTapTargetSize) {
-      case MaterialTapTargetSize.expanded:
+      case MaterialTapTargetSize.padded:
         result = new ConstrainedBox(
           constraints: const BoxConstraints(minWidth: 48.0, minHeight: 48.0),
           child: new Center(
@@ -1450,7 +1450,7 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
           );
         }
         break;
-      case MaterialTapTargetSize.collapsed:
+      case MaterialTapTargetSize.shrinkWrap:
         break;
     }
 
diff --git a/packages/flutter/lib/src/material/flat_button.dart b/packages/flutter/lib/src/material/flat_button.dart
index b799ed4f8e53e..4e3b395b73fb7 100644
--- a/packages/flutter/lib/src/material/flat_button.dart
+++ b/packages/flutter/lib/src/material/flat_button.dart
@@ -283,10 +283,10 @@ class FlatButton extends StatelessWidget {
     final Color textColor = _getTextColor(theme, buttonTheme, fillColor);
     BoxConstraints outerConstraints;
     switch (theme.materialTapTargetSize) {
-      case MaterialTapTargetSize.expanded:
+      case MaterialTapTargetSize.padded:
         outerConstraints = const BoxConstraints(minHeight: 48.0, minWidth: 48.0);
         break;
-      case MaterialTapTargetSize.collapsed:
+      case MaterialTapTargetSize.shrinkWrap:
         break;
     }
 
diff --git a/packages/flutter/lib/src/material/floating_action_button.dart b/packages/flutter/lib/src/material/floating_action_button.dart
index cfe04f35a20ff..a7a6fd8949b7b 100644
--- a/packages/flutter/lib/src/material/floating_action_button.dart
+++ b/packages/flutter/lib/src/material/floating_action_button.dart
@@ -266,10 +266,10 @@ class _FloatingActionButtonState extends State<FloatingActionButton> {
 
     BoxConstraints outerConstraints;
     switch (theme.materialTapTargetSize) {
-      case MaterialTapTargetSize.expanded:
+      case MaterialTapTargetSize.padded:
         outerConstraints = const BoxConstraints(minHeight: 48.0, minWidth: 48.0);
         break;
-      case MaterialTapTargetSize.collapsed:
+      case MaterialTapTargetSize.shrinkWrap:
         break;
     }
 
diff --git a/packages/flutter/lib/src/material/input_border.dart b/packages/flutter/lib/src/material/input_border.dart
index 79a5b3a7f2db9..ea2155bb88f91 100644
--- a/packages/flutter/lib/src/material/input_border.dart
+++ b/packages/flutter/lib/src/material/input_border.dart
@@ -31,7 +31,7 @@ abstract class InputBorder extends ShapeBorder {
   /// No input border.
   ///
   /// Use this value with [InputDecoration.border] to specify that no border
-  /// should be drawn. The [InputDecoration.collapsed] constructor sets
+  /// should be drawn. The [InputDecoration.shrinkWrap] constructor sets
   /// its border to this value.
   static const InputBorder none = const _NoInputBorder();
 
diff --git a/packages/flutter/lib/src/material/radio.dart b/packages/flutter/lib/src/material/radio.dart
index b50b0872a32a1..386284de0050b 100644
--- a/packages/flutter/lib/src/material/radio.dart
+++ b/packages/flutter/lib/src/material/radio.dart
@@ -119,10 +119,10 @@ class _RadioState<T> extends State<Radio<T>> with TickerProviderStateMixin {
     final ThemeData themeData = Theme.of(context);
     Size size;
     switch (themeData.materialTapTargetSize) {
-      case MaterialTapTargetSize.expanded:
+      case MaterialTapTargetSize.padded:
         size = const Size(2 * kRadialReactionRadius + 8.0, 2 * kRadialReactionRadius + 8.0);
         break;
-      case MaterialTapTargetSize.collapsed:
+      case MaterialTapTargetSize.shrinkWrap:
         size = const Size(2 * kRadialReactionRadius, 2 * kRadialReactionRadius);
         break;
     }
diff --git a/packages/flutter/lib/src/material/radio_list_tile.dart b/packages/flutter/lib/src/material/radio_list_tile.dart
index 0154d2134341b..919168c2dff88 100644
--- a/packages/flutter/lib/src/material/radio_list_tile.dart
+++ b/packages/flutter/lib/src/material/radio_list_tile.dart
@@ -194,7 +194,7 @@ class RadioListTile<T> extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final ThemeData themeData = Theme.of(context).copyWith(materialTapTargetSize: MaterialTapTargetSize.collapsed);
+    final ThemeData themeData = Theme.of(context).copyWith(materialTapTargetSize: MaterialTapTargetSize.shrinkWrap);
     final Widget control = new Radio<T>(
       value: value,
       groupValue: groupValue,
diff --git a/packages/flutter/lib/src/material/raised_button.dart b/packages/flutter/lib/src/material/raised_button.dart
index 0f1c341323485..c9a94a5660364 100644
--- a/packages/flutter/lib/src/material/raised_button.dart
+++ b/packages/flutter/lib/src/material/raised_button.dart
@@ -367,10 +367,10 @@ class RaisedButton extends StatelessWidget {
     final Color textColor = _getTextColor(theme, buttonTheme, fillColor);
     BoxConstraints outerConstraints;
     switch (theme.materialTapTargetSize) {
-      case MaterialTapTargetSize.expanded:
+      case MaterialTapTargetSize.padded:
         outerConstraints = const BoxConstraints(minHeight: 48.0, minWidth: 48.0);
         break;
-      case MaterialTapTargetSize.collapsed:
+      case MaterialTapTargetSize.shrinkWrap:
         break;
     }
 
diff --git a/packages/flutter/lib/src/material/switch.dart b/packages/flutter/lib/src/material/switch.dart
index 7db7382f7f6b2..5337fc5f841d9 100644
--- a/packages/flutter/lib/src/material/switch.dart
+++ b/packages/flutter/lib/src/material/switch.dart
@@ -153,10 +153,10 @@ class _SwitchState extends State<Switch> with TickerProviderStateMixin {
     }
     Size size;
     switch (themeData.materialTapTargetSize) {
-      case MaterialTapTargetSize.expanded:
+      case MaterialTapTargetSize.padded:
         size = const Size(_kSwitchWidth, _kSwitchHeight);
         break;
-      case MaterialTapTargetSize.collapsed:
+      case MaterialTapTargetSize.shrinkWrap:
         size = const Size(_kSwitchWidth, _kSwitchHeightCollapsed);
         break;
     }
diff --git a/packages/flutter/lib/src/material/switch_list_tile.dart b/packages/flutter/lib/src/material/switch_list_tile.dart
index d519952ab8868..57e39dd750f69 100644
--- a/packages/flutter/lib/src/material/switch_list_tile.dart
+++ b/packages/flutter/lib/src/material/switch_list_tile.dart
@@ -166,7 +166,7 @@ class SwitchListTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final ThemeData themeData = Theme.of(context).copyWith(materialTapTargetSize: MaterialTapTargetSize.collapsed);
+    final ThemeData themeData = Theme.of(context).copyWith(materialTapTargetSize: MaterialTapTargetSize.shrinkWrap);
     final Widget control = new Switch(
       value: value,
       onChanged: onChanged,
diff --git a/packages/flutter/lib/src/material/theme_data.dart b/packages/flutter/lib/src/material/theme_data.dart
index b083ac085d015..bce843830033b 100644
--- a/packages/flutter/lib/src/material/theme_data.dart
+++ b/packages/flutter/lib/src/material/theme_data.dart
@@ -38,6 +38,9 @@ const Color _kDarkThemeSplashColor = const Color(0x40CCCCCC);
 
 /// Configures the tap target and layout size of certain Material widgets.
 ///
+/// Changing the value in [ThemeData.materialTapTargetSize] will affect the
+/// accessibility experience.
+///
 /// Some of the impacted widgets include:
 ///
 ///   * [FloatingActionButton], only the mini tap target size is increased.
@@ -60,12 +63,13 @@ enum MaterialTapTargetSize {
   /// Expands the minimum tap target size to 48px by 48px.
   ///
   /// This is the default value of [ThemeData.materialHitTestSize] and the
-  /// recommended behavior to conform to Android accessibility recommendations.
-  expanded,
+  /// recommended size to conform to Android accessibility scanner
+  /// recommendations.
+  padded,
 
-  /// Collapses the tap target size to the minimum provided by the Material
+  /// Shrinks the tap target size to the minimum provided by the Material
   /// specification.
-  collapsed,
+  shrinkWrap,
 }
 
 /// Holds the color and typography values for a material design theme.
@@ -139,7 +143,7 @@ class ThemeData extends Diagnosticable {
     TargetPlatform platform,
     MaterialTapTargetSize materialTapTargetSize,
   }) {
-    materialTapTargetSize ??= MaterialTapTargetSize.expanded;
+    materialTapTargetSize ??= MaterialTapTargetSize.padded;
     brightness ??= Brightness.light;
     final bool isDark = brightness == Brightness.dark;
     primarySwatch ??= Colors.blue;
diff --git a/packages/flutter/lib/src/material/time_picker.dart b/packages/flutter/lib/src/material/time_picker.dart
index 59666cf395507..46cad86138320 100644
--- a/packages/flutter/lib/src/material/time_picker.dart
+++ b/packages/flutter/lib/src/material/time_picker.dart
@@ -1583,11 +1583,11 @@ class _TimePickerDialogState extends State<_TimePickerDialog> {
           double timePickerHeightPortrait;
           double timePickerHeightLandscape;
           switch (theme.materialTapTargetSize) {
-            case MaterialTapTargetSize.expanded:
+            case MaterialTapTargetSize.padded:
               timePickerHeightPortrait = _kTimePickerHeightPortrait;
               timePickerHeightLandscape = _kTimePickerHeightLandscape;
               break;
-            case MaterialTapTargetSize.collapsed:
+            case MaterialTapTargetSize.shrinkWrap:
               timePickerHeightPortrait = _kTimePickerHeightPortraitCollapsed;
               timePickerHeightLandscape = _kTimePickerHeightLandscapeCollapsed;
               break;
diff --git a/packages/flutter/test/material/buttons_test.dart b/packages/flutter/test/material/buttons_test.dart
index 44bfae2a67eba..b1477c3c66601 100644
--- a/packages/flutter/test/material/buttons_test.dart
+++ b/packages/flutter/test/material/buttons_test.dart
@@ -188,7 +188,7 @@ void main() {
         textDirection: TextDirection.ltr,
         child: new Theme(
           data: new ThemeData(
-            materialTapTargetSize: MaterialTapTargetSize.collapsed,
+            materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
           ),
           child: buttonWidget,
         ),
@@ -235,7 +235,7 @@ void main() {
           data: new ThemeData(
             highlightColor: themeHighlightColor1,
             splashColor: themeSplashColor1,
-            materialTapTargetSize: MaterialTapTargetSize.collapsed,
+            materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
           ),
           child: buttonWidget,
         ),
@@ -263,7 +263,7 @@ void main() {
           data: new ThemeData(
             highlightColor: themeHighlightColor2,
             splashColor: themeSplashColor2,
-            materialTapTargetSize: MaterialTapTargetSize.collapsed,
+            materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
           ),
           child: buttonWidget, // same widget, so does not get updated because of us
         ),
diff --git a/packages/flutter/test/material/checkbox_test.dart b/packages/flutter/test/material/checkbox_test.dart
index 840a9e214def2..b4d5955b38b5c 100644
--- a/packages/flutter/test/material/checkbox_test.dart
+++ b/packages/flutter/test/material/checkbox_test.dart
@@ -16,19 +16,44 @@ void main() {
     debugResetSemanticsIdCounter();
   });
 
-  testWidgets('Checkbox size is 48x48', (WidgetTester tester) async {
+  testWidgets('Checkbox size is configurable by ThemeData.materialTapTargetSize', (WidgetTester tester) async {
     await tester.pumpWidget(
-      new Material(
-        child: new Center(
-          child: new Checkbox(
-            value: false,
-            onChanged: (bool newValue) { },
+      new Theme(
+        data: new ThemeData(materialTapTargetSize: MaterialTapTargetSize.padded),
+        child: new Directionality(
+          textDirection: TextDirection.ltr,
+          child: new Material(
+            child: new Center(
+              child: new Checkbox(
+                value: true,
+                onChanged: (bool newValue) {},
+              ),
+            ),
           ),
         ),
       ),
     );
 
     expect(tester.getSize(find.byType(Checkbox)), const Size(48.0, 48.0));
+
+    await tester.pumpWidget(
+      new Theme(
+        data: new ThemeData(materialTapTargetSize: MaterialTapTargetSize.shrinkWrap),
+        child: new Directionality(
+          textDirection: TextDirection.ltr,
+          child: new Material(
+            child: new Center(
+              child: new Checkbox(
+                value: true,
+                onChanged: (bool newValue) {},
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    expect(tester.getSize(find.byType(Checkbox)), const Size(40.0, 40.0));
   });
 
   testWidgets('CheckBox semantics', (WidgetTester tester) async {
diff --git a/packages/flutter/test/material/outline_button_test.dart b/packages/flutter/test/material/outline_button_test.dart
index c1cdea80bb751..8435cbad60ef0 100644
--- a/packages/flutter/test/material/outline_button_test.dart
+++ b/packages/flutter/test/material/outline_button_test.dart
@@ -55,7 +55,7 @@ void main() {
       new Directionality(
         textDirection: TextDirection.ltr,
         child: new Theme(
-          data: new ThemeData(materialTapTargetSize: MaterialTapTargetSize.collapsed),
+          data: new ThemeData(materialTapTargetSize: MaterialTapTargetSize.shrinkWrap),
           child: new Container(
             alignment: Alignment.topLeft,
             child: new OutlineButton(
diff --git a/packages/flutter/test/material/radio_test.dart b/packages/flutter/test/material/radio_test.dart
index 4a8b858c9924f..5fd0196c3fc34 100644
--- a/packages/flutter/test/material/radio_test.dart
+++ b/packages/flutter/test/material/radio_test.dart
@@ -64,23 +64,50 @@ void main() {
     expect(log, isEmpty);
   });
 
-  testWidgets('Radio size is 48x48', (WidgetTester tester) async {
-    final Key key = new UniqueKey();
+  testWidgets('Radio size is configurable by ThemeData.materialTapTargetSize', (WidgetTester tester) async {
+    final Key key1 = new UniqueKey();
+    await tester.pumpWidget(
+      new Theme(
+        data: new ThemeData(materialTapTargetSize: MaterialTapTargetSize.padded),
+        child: new Directionality(
+          textDirection: TextDirection.ltr,
+          child: new Material(
+            child: new Center(
+              child: new Radio<bool>(
+                key: key1,
+                groupValue: true,
+                value: true,
+                onChanged: (bool newValue) {},
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    expect(tester.getSize(find.byKey(key1)), const Size(48.0, 48.0));
 
+    final Key key2 = new UniqueKey();
     await tester.pumpWidget(
-      new Material(
-        child: new Center(
-          child: new Radio<int>(
-            key: key,
-            value: 1,
-            groupValue: 2,
-            onChanged: (int newValue) { },
+      new Theme(
+        data: new ThemeData(materialTapTargetSize: MaterialTapTargetSize.shrinkWrap),
+        child: new Directionality(
+          textDirection: TextDirection.ltr,
+          child: new Material(
+            child: new Center(
+              child: new Radio<bool>(
+                key: key2,
+                groupValue: true,
+                value: true,
+                onChanged: (bool newValue) {},
+              ),
+            ),
           ),
         ),
       ),
     );
 
-    expect(tester.getSize(find.byKey(key)), const Size(48.0, 48.0));
+    expect(tester.getSize(find.byKey(key2)), const Size(40.0, 40.0));
   });
 
 
diff --git a/packages/flutter/test/material/switch_test.dart b/packages/flutter/test/material/switch_test.dart
index 48a72949e048c..c0e18417c6e45 100644
--- a/packages/flutter/test/material/switch_test.dart
+++ b/packages/flutter/test/material/switch_test.dart
@@ -43,6 +43,46 @@ void main() {
     expect(value, isTrue);
   });
 
+  testWidgets('Switch size is configurable by ThemeData.materialTapTargetSize', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      new Theme(
+        data: new ThemeData(materialTapTargetSize: MaterialTapTargetSize.padded),
+        child: new Directionality(
+          textDirection: TextDirection.ltr,
+          child: new Material(
+            child: new Center(
+              child: new Switch(
+                value: true,
+                onChanged: (bool newValue) {},
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    expect(tester.getSize(find.byType(Switch)), const Size(59.0, 48.0));
+
+    await tester.pumpWidget(
+      new Theme(
+        data: new ThemeData(materialTapTargetSize: MaterialTapTargetSize.shrinkWrap),
+        child: new Directionality(
+          textDirection: TextDirection.ltr,
+          child: new Material(
+            child: new Center(
+              child: new Switch(
+                value: true,
+                onChanged: (bool newValue) {},
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    expect(tester.getSize(find.byType(Switch)), const Size(59.0, 40.0));
+  });
+
   testWidgets('Switch can drag (LTR)', (WidgetTester tester) async {
     bool value = false;
 
diff --git a/packages/flutter/test/material/theme_data_test.dart b/packages/flutter/test/material/theme_data_test.dart
index 0392cd885a39d..6849de8f4d9d2 100644
--- a/packages/flutter/test/material/theme_data_test.dart
+++ b/packages/flutter/test/material/theme_data_test.dart
@@ -106,7 +106,7 @@ void main() {
   test('Defaults to MaterialTapTargetBehavior.expanded', () {
     final ThemeData themeData = new ThemeData();
 
-    expect(themeData.materialTapTargetSize, MaterialTapTargetSize.expanded);
+    expect(themeData.materialTapTargetSize, MaterialTapTargetSize.padded);
   });
 
   test('Can control fontFamily', () {

From 090b3d273dcfeb6fc7256dc6c3a4f46b1e89573c Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Mon, 11 Jun 2018 17:24:11 -0700
Subject: [PATCH 25/33] add size tests to buttons, mini fab, and raw chip

---
 .../flutter/test/material/buttons_test.dart   | 132 ++++++++++++++++++
 packages/flutter/test/material/chip_test.dart |  36 +++++
 .../material/floating_action_button_test.dart |  38 +++++
 3 files changed, 206 insertions(+)

diff --git a/packages/flutter/test/material/buttons_test.dart b/packages/flutter/test/material/buttons_test.dart
index b1477c3c66601..7378d81995c03 100644
--- a/packages/flutter/test/material/buttons_test.dart
+++ b/packages/flutter/test/material/buttons_test.dart
@@ -358,4 +358,136 @@ void main() {
 
     semantics.dispose();
   });
+
+  testWidgets('MaterialButton size is configurable by ThemeData.materialTapTargetSize', (WidgetTester tester) async {
+    final Key key1 = new UniqueKey();
+    await tester.pumpWidget(
+      new Theme(
+        data: new ThemeData(materialTapTargetSize: MaterialTapTargetSize.padded),
+        child: new Directionality(
+          textDirection: TextDirection.ltr,
+          child: new Material(
+            child: new Center(
+              child: new MaterialButton(
+                key: key1,
+                child: const SizedBox(width: 50.0, height: 8.0),
+                onPressed: () {},
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    expect(tester.getSize(find.byKey(key1)), const Size(88.0, 48.0));
+
+    final Key key2 = new UniqueKey();
+    await tester.pumpWidget(
+      new Theme(
+        data: new ThemeData(materialTapTargetSize: MaterialTapTargetSize.shrinkWrap),
+        child: new Directionality(
+          textDirection: TextDirection.ltr,
+          child: new Material(
+            child: new Center(
+              child: new MaterialButton(
+                key: key2,
+                child: const SizedBox(width: 50.0, height: 8.0),
+                onPressed: () {},
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    expect(tester.getSize(find.byKey(key2)), const Size(88.0, 36.0));
+  });
+
+  testWidgets('FlatButton size is configurable by ThemeData.materialTapTargetSize', (WidgetTester tester) async {
+    final Key key1 = new UniqueKey();
+    await tester.pumpWidget(
+      new Theme(
+        data: new ThemeData(materialTapTargetSize: MaterialTapTargetSize.padded),
+        child: new Directionality(
+          textDirection: TextDirection.ltr,
+          child: new Material(
+            child: new Center(
+              child: new FlatButton(
+                key: key1,
+                child: const SizedBox(width: 50.0, height: 8.0),
+                onPressed: () {},
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    expect(tester.getSize(find.byKey(key1)), const Size(88.0, 48.0));
+
+    final Key key2 = new UniqueKey();
+    await tester.pumpWidget(
+      new Theme(
+        data: new ThemeData(materialTapTargetSize: MaterialTapTargetSize.shrinkWrap),
+        child: new Directionality(
+          textDirection: TextDirection.ltr,
+          child: new Material(
+            child: new Center(
+              child: new FlatButton(
+                key: key2,
+                child: const SizedBox(width: 50.0, height: 8.0),
+                onPressed: () {},
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    expect(tester.getSize(find.byKey(key2)), const Size(88.0, 36.0));
+  });
+
+  testWidgets('RaisedButton size is configurable by ThemeData.materialTapTargetSize', (WidgetTester tester) async {
+    final Key key1 = new UniqueKey();
+    await tester.pumpWidget(
+      new Theme(
+        data: new ThemeData(materialTapTargetSize: MaterialTapTargetSize.padded),
+        child: new Directionality(
+          textDirection: TextDirection.ltr,
+          child: new Material(
+            child: new Center(
+              child: new RaisedButton(
+                key: key1,
+                child: const SizedBox(width: 50.0, height: 8.0),
+                onPressed: () {},
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    expect(tester.getSize(find.byKey(key1)), const Size(88.0, 48.0));
+
+    final Key key2 = new UniqueKey();
+    await tester.pumpWidget(
+      new Theme(
+        data: new ThemeData(materialTapTargetSize: MaterialTapTargetSize.shrinkWrap),
+        child: new Directionality(
+          textDirection: TextDirection.ltr,
+          child: new Material(
+            child: new Center(
+              child: new RaisedButton(
+                key: key2,
+                child: const SizedBox(width: 50.0, height: 8.0),
+                onPressed: () {},
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    expect(tester.getSize(find.byKey(key2)), const Size(88.0, 36.0));
+  });
 }
diff --git a/packages/flutter/test/material/chip_test.dart b/packages/flutter/test/material/chip_test.dart
index 35f7ad741d940..742c1d840ccd7 100644
--- a/packages/flutter/test/material/chip_test.dart
+++ b/packages/flutter/test/material/chip_test.dart
@@ -1019,6 +1019,42 @@ void main() {
     expect(materialBox, paints..path(color: chipTheme.disabledColor));
   });
 
+  testWidgets('Chip size is configurable by ThemeData.materialTapTargetSize', (WidgetTester tester) async {
+    final Key key1 = new UniqueKey();
+    await tester.pumpWidget(
+      _wrapForChip(
+        child: new Theme(
+          data: new ThemeData(materialTapTargetSize: MaterialTapTargetSize.padded),
+          child: new Center(
+            child: new RawChip(
+              key: key1,
+              label: const Text('test'),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    expect(tester.getSize(find.byKey(key1)), const Size(80.0, 48.0));
+
+    final Key key2 = new UniqueKey();
+    await tester.pumpWidget(
+      _wrapForChip(
+        child: new Theme(
+          data: new ThemeData(materialTapTargetSize: MaterialTapTargetSize.shrinkWrap),
+          child: new Center(
+            child: new RawChip(
+              key: key2,
+              label: const Text('test'),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    expect(tester.getSize(find.byKey(key2)), const Size(80.0, 32.0));
+  });
+
   testWidgets('Chip uses the right theme colors for the right components', (WidgetTester tester) async {
     final ThemeData themeData = new ThemeData(
       platform: TargetPlatform.android,
diff --git a/packages/flutter/test/material/floating_action_button_test.dart b/packages/flutter/test/material/floating_action_button_test.dart
index 85621f8ecba5f..6ee14574e93d3 100644
--- a/packages/flutter/test/material/floating_action_button_test.dart
+++ b/packages/flutter/test/material/floating_action_button_test.dart
@@ -69,6 +69,44 @@ void main() {
     expect(find.byType(Text), findsOneWidget);
   });
 
+  testWidgets('FlatActionButton mini size is configurable by ThemeData.materialTapTargetSize', (WidgetTester tester) async {
+    final Key key1 = new UniqueKey();
+    await tester.pumpWidget(
+      new MaterialApp(
+        home: new Theme(
+          data: new ThemeData(materialTapTargetSize: MaterialTapTargetSize.padded),
+          child: new Scaffold(
+            floatingActionButton: new FloatingActionButton(
+              key: key1,
+              mini: true,
+              onPressed: null,
+            ),
+          ),
+        ),
+      ),
+    );
+
+    expect(tester.getSize(find.byKey(key1)), const Size(48.0, 48.0));
+
+    final Key key2 = new UniqueKey();
+    await tester.pumpWidget(
+      new MaterialApp(
+        home: new Theme(
+          data: new ThemeData(materialTapTargetSize: MaterialTapTargetSize.shrinkWrap),
+          child: new Scaffold(
+            floatingActionButton: new FloatingActionButton(
+              key: key2,
+              mini: true,
+              onPressed: null,
+            ),
+          ),
+        ),
+      ),
+    );
+
+    expect(tester.getSize(find.byKey(key2)), const Size(40.0, 40.0));
+  });
+
   testWidgets('FloatingActionButton.isExtended', (WidgetTester tester) async {
     await tester.pumpWidget(
       new MaterialApp(

From bb6c3ace0a4df22c235b1f1fbf68aa13e6eb64aa Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Tue, 12 Jun 2018 09:30:35 -0700
Subject: [PATCH 26/33] make Checkbox, Radio, and Switch take a
 MaterialTapTargetSize enum in constructor

---
 .../flutter/lib/src/material/checkbox.dart    | 12 +++++++-
 .../lib/src/material/checkbox_list_tile.dart  | 29 +++++++++----------
 packages/flutter/lib/src/material/radio.dart  | 14 +++++++--
 .../lib/src/material/radio_list_tile.dart     | 29 +++++++++----------
 packages/flutter/lib/src/material/switch.dart | 14 +++++++--
 .../lib/src/material/switch_list_tile.dart    | 29 +++++++++----------
 6 files changed, 74 insertions(+), 53 deletions(-)

diff --git a/packages/flutter/lib/src/material/checkbox.dart b/packages/flutter/lib/src/material/checkbox.dart
index f7bddef334405..1df0cb0139b4c 100644
--- a/packages/flutter/lib/src/material/checkbox.dart
+++ b/packages/flutter/lib/src/material/checkbox.dart
@@ -59,6 +59,7 @@ class Checkbox extends StatefulWidget {
     this.tristate = false,
     @required this.onChanged,
     this.activeColor,
+    this.materialTapTargetSize,
   }) : assert(tristate != null),
        assert(tristate || value != null),
        super(key: key);
@@ -114,6 +115,15 @@ class Checkbox extends StatefulWidget {
   /// If tristate is false (the default), [value] must not be null.
   final bool tristate;
 
+  /// Configures the minimum size of the tap target.
+  ///
+  /// Defaults to [ThemeData.materialTapTargetSize].
+  ///
+  /// See also:
+  ///
+  ///   * [MaterialTapTargetSize], for a description of how this effects tap targets.
+  final MaterialTapTargetSize materialTapTargetSize;
+
   /// The width of a checkbox widget.
   static const double width = 18.0;
 
@@ -127,7 +137,7 @@ class _CheckboxState extends State<Checkbox> with TickerProviderStateMixin {
     assert(debugCheckHasMaterial(context));
     final ThemeData themeData = Theme.of(context);
     Size size;
-    switch (themeData.materialTapTargetSize) {
+    switch (widget.materialTapTargetSize ?? themeData.materialTapTargetSize) {
       case MaterialTapTargetSize.padded:
         size = const Size(2 * kRadialReactionRadius + 8.0, 2 * kRadialReactionRadius + 8.0);
         break;
diff --git a/packages/flutter/lib/src/material/checkbox_list_tile.dart b/packages/flutter/lib/src/material/checkbox_list_tile.dart
index e1f4aed4632f8..9c1c9fe34f172 100644
--- a/packages/flutter/lib/src/material/checkbox_list_tile.dart
+++ b/packages/flutter/lib/src/material/checkbox_list_tile.dart
@@ -170,11 +170,11 @@ class CheckboxListTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final ThemeData themeData = Theme.of(context).copyWith(materialTapTargetSize: MaterialTapTargetSize.shrinkWrap);
     final Widget control = new Checkbox(
       value: value,
       onChanged: onChanged,
       activeColor: activeColor,
+      materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
     );
     Widget leading, trailing;
     switch (controlAffinity) {
@@ -189,21 +189,18 @@ class CheckboxListTile extends StatelessWidget {
         break;
     }
     return new MergeSemantics(
-      child: new Theme(
-        data: themeData,
-        child: ListTileTheme.merge(
-          selectedColor: activeColor ?? Theme.of(context).accentColor,
-          child: new ListTile(
-            leading: leading,
-            title: title,
-            subtitle: subtitle,
-            trailing: trailing,
-            isThreeLine: isThreeLine,
-            dense: dense,
-            enabled: onChanged != null,
-            onTap: onChanged != null ? () { onChanged(!value); } : null,
-            selected: selected,
-          ),
+      child: ListTileTheme.merge(
+        selectedColor: activeColor ?? Theme.of(context).accentColor,
+        child: new ListTile(
+          leading: leading,
+          title: title,
+          subtitle: subtitle,
+          trailing: trailing,
+          isThreeLine: isThreeLine,
+          dense: dense,
+          enabled: onChanged != null,
+          onTap: onChanged != null ? () { onChanged(!value); } : null,
+          selected: selected,
         ),
       ),
     );
diff --git a/packages/flutter/lib/src/material/radio.dart b/packages/flutter/lib/src/material/radio.dart
index 386284de0050b..928953305bab5 100644
--- a/packages/flutter/lib/src/material/radio.dart
+++ b/packages/flutter/lib/src/material/radio.dart
@@ -55,7 +55,8 @@ class Radio<T> extends StatefulWidget {
     @required this.value,
     @required this.groupValue,
     @required this.onChanged,
-    this.activeColor
+    this.activeColor,
+    this.materialTapTargetSize,
   }) : super(key: key);
 
   /// The value represented by this radio button.
@@ -97,6 +98,15 @@ class Radio<T> extends StatefulWidget {
   /// Defaults to [ThemeData.toggleableActiveColor].
   final Color activeColor;
 
+  /// Configures the minimum size of the tap target.
+  ///
+  /// Defaults to [ThemeData.materialTapTargetSize].
+  ///
+  /// See also:
+  ///
+  ///   * [MaterialTapTargetSize], for a description of how this effects tap targets.
+  final MaterialTapTargetSize materialTapTargetSize;
+
   @override
   _RadioState<T> createState() => new _RadioState<T>();
 }
@@ -118,7 +128,7 @@ class _RadioState<T> extends State<Radio<T>> with TickerProviderStateMixin {
     assert(debugCheckHasMaterial(context));
     final ThemeData themeData = Theme.of(context);
     Size size;
-    switch (themeData.materialTapTargetSize) {
+    switch (widget.materialTapTargetSize ?? themeData.materialTapTargetSize) {
       case MaterialTapTargetSize.padded:
         size = const Size(2 * kRadialReactionRadius + 8.0, 2 * kRadialReactionRadius + 8.0);
         break;
diff --git a/packages/flutter/lib/src/material/radio_list_tile.dart b/packages/flutter/lib/src/material/radio_list_tile.dart
index 919168c2dff88..698e46f25fb1e 100644
--- a/packages/flutter/lib/src/material/radio_list_tile.dart
+++ b/packages/flutter/lib/src/material/radio_list_tile.dart
@@ -194,12 +194,12 @@ class RadioListTile<T> extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final ThemeData themeData = Theme.of(context).copyWith(materialTapTargetSize: MaterialTapTargetSize.shrinkWrap);
     final Widget control = new Radio<T>(
       value: value,
       groupValue: groupValue,
       onChanged: onChanged,
       activeColor: activeColor,
+      materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
     );
     Widget leading, trailing;
     switch (controlAffinity) {
@@ -214,21 +214,18 @@ class RadioListTile<T> extends StatelessWidget {
         break;
     }
     return new MergeSemantics(
-      child: new Theme(
-        data: themeData,
-        child: ListTileTheme.merge(
-          selectedColor: activeColor ?? Theme.of(context).accentColor,
-          child: new ListTile(
-            leading: leading,
-            title: title,
-            subtitle: subtitle,
-            trailing: trailing,
-            isThreeLine: isThreeLine,
-            dense: dense,
-            enabled: onChanged != null,
-            onTap: onChanged != null ? () { onChanged(value); } : null,
-            selected: selected,
-          ),
+      child: ListTileTheme.merge(
+        selectedColor: activeColor ?? Theme.of(context).accentColor,
+        child: new ListTile(
+          leading: leading,
+          title: title,
+          subtitle: subtitle,
+          trailing: trailing,
+          isThreeLine: isThreeLine,
+          dense: dense,
+          enabled: onChanged != null,
+          onTap: onChanged != null ? () { onChanged(value); } : null,
+          selected: selected,
         ),
       ),
     );
diff --git a/packages/flutter/lib/src/material/switch.dart b/packages/flutter/lib/src/material/switch.dart
index 5337fc5f841d9..73708c540d104 100644
--- a/packages/flutter/lib/src/material/switch.dart
+++ b/packages/flutter/lib/src/material/switch.dart
@@ -63,7 +63,8 @@ class Switch extends StatefulWidget {
     this.inactiveThumbColor,
     this.inactiveTrackColor,
     this.activeThumbImage,
-    this.inactiveThumbImage
+    this.inactiveThumbImage,
+    this.materialTapTargetSize,
   }) : super(key: key);
 
   /// Whether this switch is on or off.
@@ -121,6 +122,15 @@ class Switch extends StatefulWidget {
   /// An image to use on the thumb of this switch when the switch is off.
   final ImageProvider inactiveThumbImage;
 
+  /// Configures the minimum size of the tap target.
+  ///
+  /// Defaults to [ThemeData.materialTapTargetSize].
+  ///
+  /// See also:
+  ///
+  ///   * [MaterialTapTargetSize], for a description of how this effects tap targets.
+  final MaterialTapTargetSize materialTapTargetSize;
+
   @override
   _SwitchState createState() => new _SwitchState();
 
@@ -152,7 +162,7 @@ class _SwitchState extends State<Switch> with TickerProviderStateMixin {
       inactiveTrackColor = widget.inactiveTrackColor ?? (isDark ? Colors.white10 : Colors.black12);
     }
     Size size;
-    switch (themeData.materialTapTargetSize) {
+    switch (widget.materialTapTargetSize ?? themeData.materialTapTargetSize) {
       case MaterialTapTargetSize.padded:
         size = const Size(_kSwitchWidth, _kSwitchHeight);
         break;
diff --git a/packages/flutter/lib/src/material/switch_list_tile.dart b/packages/flutter/lib/src/material/switch_list_tile.dart
index 57e39dd750f69..151234cba563d 100644
--- a/packages/flutter/lib/src/material/switch_list_tile.dart
+++ b/packages/flutter/lib/src/material/switch_list_tile.dart
@@ -166,30 +166,27 @@ class SwitchListTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final ThemeData themeData = Theme.of(context).copyWith(materialTapTargetSize: MaterialTapTargetSize.shrinkWrap);
     final Widget control = new Switch(
       value: value,
       onChanged: onChanged,
       activeColor: activeColor,
       activeThumbImage: activeThumbImage,
       inactiveThumbImage: inactiveThumbImage,
+      materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
     );
     return new MergeSemantics(
-      child: new Theme(
-        data: themeData,
-        child: ListTileTheme.merge(
-          selectedColor: activeColor ?? Theme.of(context).accentColor,
-          child: new ListTile(
-            leading: secondary,
-            title: title,
-            subtitle: subtitle,
-            trailing: control,
-            isThreeLine: isThreeLine,
-            dense: dense,
-            enabled: onChanged != null,
-            onTap: onChanged != null ? () { onChanged(!value); } : null,
-            selected: selected,
-          ),
+      child: ListTileTheme.merge(
+        selectedColor: activeColor ?? Theme.of(context).accentColor,
+        child: new ListTile(
+          leading: secondary,
+          title: title,
+          subtitle: subtitle,
+          trailing: control,
+          isThreeLine: isThreeLine,
+          dense: dense,
+          enabled: onChanged != null,
+          onTap: onChanged != null ? () { onChanged(!value); } : null,
+          selected: selected,
         ),
       ),
     );

From b26dafba56651f4073abe2562e3e90c103f7c3c6 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Tue, 12 Jun 2018 09:32:03 -0700
Subject: [PATCH 27/33] effects vs affects

---
 packages/flutter/lib/src/material/checkbox.dart | 2 +-
 packages/flutter/lib/src/material/radio.dart    | 2 +-
 packages/flutter/lib/src/material/switch.dart   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/flutter/lib/src/material/checkbox.dart b/packages/flutter/lib/src/material/checkbox.dart
index 1df0cb0139b4c..953cf961a709c 100644
--- a/packages/flutter/lib/src/material/checkbox.dart
+++ b/packages/flutter/lib/src/material/checkbox.dart
@@ -121,7 +121,7 @@ class Checkbox extends StatefulWidget {
   ///
   /// See also:
   ///
-  ///   * [MaterialTapTargetSize], for a description of how this effects tap targets.
+  ///   * [MaterialTapTargetSize], for a description of how this affects tap targets.
   final MaterialTapTargetSize materialTapTargetSize;
 
   /// The width of a checkbox widget.
diff --git a/packages/flutter/lib/src/material/radio.dart b/packages/flutter/lib/src/material/radio.dart
index 928953305bab5..60f794b7d5af6 100644
--- a/packages/flutter/lib/src/material/radio.dart
+++ b/packages/flutter/lib/src/material/radio.dart
@@ -104,7 +104,7 @@ class Radio<T> extends StatefulWidget {
   ///
   /// See also:
   ///
-  ///   * [MaterialTapTargetSize], for a description of how this effects tap targets.
+  ///   * [MaterialTapTargetSize], for a description of how this affects tap targets.
   final MaterialTapTargetSize materialTapTargetSize;
 
   @override
diff --git a/packages/flutter/lib/src/material/switch.dart b/packages/flutter/lib/src/material/switch.dart
index 73708c540d104..3dda965d923c9 100644
--- a/packages/flutter/lib/src/material/switch.dart
+++ b/packages/flutter/lib/src/material/switch.dart
@@ -128,7 +128,7 @@ class Switch extends StatefulWidget {
   ///
   /// See also:
   ///
-  ///   * [MaterialTapTargetSize], for a description of how this effects tap targets.
+  ///   * [MaterialTapTargetSize], for a description of how this affects tap targets.
   final MaterialTapTargetSize materialTapTargetSize;
 
   @override

From 2e205beafe1acde14ded2dab97d00faf2bf9e732 Mon Sep 17 00:00:00 2001
From: jonahwilliams <campfish91@gmail.com>
Date: Tue, 12 Jun 2018 19:50:09 -0700
Subject: [PATCH 28/33] refactor all updated material widgets to take
 materialTapTargetSize as an optional input

---
 packages/flutter/lib/src/material/button.dart | 68 +++++++++++--------
 packages/flutter/lib/src/material/chip.dart   | 34 +++++++++-
 .../flutter/lib/src/material/flat_button.dart | 22 +++---
 .../src/material/floating_action_button.dart  | 22 +++---
 .../lib/src/material/raised_button.dart       | 21 +++---
 .../material/raw_material_button_test.dart    | 12 ++--
 6 files changed, 116 insertions(+), 63 deletions(-)

diff --git a/packages/flutter/lib/src/material/button.dart b/packages/flutter/lib/src/material/button.dart
index 73f665a136975..9134fb9e1ce7b 100644
--- a/packages/flutter/lib/src/material/button.dart
+++ b/packages/flutter/lib/src/material/button.dart
@@ -39,13 +39,14 @@ class RawMaterialButton extends StatefulWidget {
     this.elevation = 2.0,
     this.highlightElevation = 8.0,
     this.disabledElevation = 0.0,
-    this.outerConstraints,
     this.padding = EdgeInsets.zero,
     this.constraints = const BoxConstraints(minWidth: 88.0, minHeight: 36.0),
     this.shape = const RoundedRectangleBorder(),
     this.animationDuration = kThemeChangeDuration,
+    MaterialTapTargetSize materialTapTargetSize,
     this.child,
-  }) : assert(shape != null),
+  }) : this.materialTapTargetSize = materialTapTargetSize ?? MaterialTapTargetSize.padded,
+       assert(shape != null),
        assert(elevation != null),
        assert(highlightElevation != null),
        assert(disabledElevation != null),
@@ -59,10 +60,6 @@ class RawMaterialButton extends StatefulWidget {
   /// If this is set to null, the button will be disabled, see [enabled].
   final VoidCallback onPressed;
 
-  /// Constraints used to increase the gesture detector size without increasing
-  /// the visible material of the button.
-  final BoxConstraints outerConstraints;
-
   /// Called by the underlying [InkWell] widget's [InkWell.onHighlightChanged]
   /// callback.
   final ValueChanged<bool> onHighlightChanged;
@@ -139,6 +136,15 @@ class RawMaterialButton extends StatefulWidget {
   /// property to a non-null value.
   bool get enabled => onPressed != null;
 
+  /// Configures the minimum size of the tap target.
+  ///
+  /// Defaults to [MaterialTapTargetSize.padded].
+  ///
+  /// See also:
+  ///
+  ///   * [MaterialTapTargetSize], for a description of how this affects tap targets.
+  final MaterialTapTargetSize materialTapTargetSize;
+
   @override
   _RawMaterialButtonState createState() => new _RawMaterialButtonState();
 }
@@ -188,20 +194,24 @@ class _RawMaterialButtonState extends State<RawMaterialButton> {
       ),
     );
 
-    if (widget.outerConstraints != null) {
-      result = new ConstrainedBox(
-        constraints: widget.outerConstraints,
-        child: new GestureDetector(
-          behavior: HitTestBehavior.translucent,
-          excludeFromSemantics: true,
-          onTap: widget.onPressed,
-          child: new Center(
-            child: result,
-            widthFactor: 1.0,
-            heightFactor: 1.0,
+    switch (widget.materialTapTargetSize) {
+      case MaterialTapTargetSize.padded:
+        result = new ConstrainedBox(
+          constraints: const BoxConstraints(minWidth: 48.0, minHeight: 48.0),
+          child: new GestureDetector(
+            behavior: HitTestBehavior.translucent,
+            excludeFromSemantics: true,
+            onTap: widget.onPressed,
+            child: new Center(
+              child: result,
+              widthFactor: 1.0,
+              heightFactor: 1.0,
+            ),
           ),
-        ),
-      );
+        );
+        break;
+      case MaterialTapTargetSize.shrinkWrap:
+        break;
     }
 
     return new Semantics(
@@ -253,6 +263,7 @@ class MaterialButton extends StatelessWidget {
     this.minWidth,
     this.height,
     this.padding,
+    this.materialTapTargetSize,
     @required this.onPressed,
     this.child
   }) : super(key: key);
@@ -358,6 +369,15 @@ class MaterialButton extends StatelessWidget {
   /// {@macro flutter.widgets.child}
   final Widget child;
 
+  /// Configures the minimum size of the tap target.
+  ///
+  /// Defaults to [ThemeData.materialTapTargetSize].
+  ///
+  /// See also:
+  ///
+  ///   * [MaterialTapTargetSize], for a description of how this affects tap targets.
+  final MaterialTapTargetSize materialTapTargetSize;
+
   /// Whether the button is enabled or disabled. Buttons are disabled by default. To
   /// enable a button, set its [onPressed] property to a non-null value.
   bool get enabled => onPressed != null;
@@ -401,14 +421,6 @@ class MaterialButton extends StatelessWidget {
     final ThemeData theme = Theme.of(context);
     final ButtonThemeData buttonTheme = ButtonTheme.of(context);
     final Color textColor = _getTextColor(theme, buttonTheme, color);
-    BoxConstraints outerConstraints;
-    switch (theme.materialTapTargetSize) {
-      case MaterialTapTargetSize.padded:
-        outerConstraints = const BoxConstraints(minHeight: 48.0, minWidth: 48.0);
-        break;
-      case MaterialTapTargetSize.shrinkWrap:
-        break;
-    }
 
     return new RawMaterialButton(
       onPressed: onPressed,
@@ -425,7 +437,7 @@ class MaterialButton extends StatelessWidget {
       ),
       shape: buttonTheme.shape,
       child: child,
-      outerConstraints: outerConstraints,
+      materialTapTargetSize: materialTapTargetSize ?? theme.materialTapTargetSize,
     );
   }
 
diff --git a/packages/flutter/lib/src/material/chip.dart b/packages/flutter/lib/src/material/chip.dart
index 5003dcb75c8dc..deecb757ed6e9 100644
--- a/packages/flutter/lib/src/material/chip.dart
+++ b/packages/flutter/lib/src/material/chip.dart
@@ -100,6 +100,15 @@ abstract class ChipAttributes {
   /// By default, this is 4 logical pixels at the beginning and the end of the
   /// label, and zero on top and bottom.
   EdgeInsetsGeometry get labelPadding;
+
+  /// Configures the minimum size of the tap target.
+  ///
+  /// Defaults to [ThemeData.materialTapTargetSize].
+  ///
+  /// See also:
+  ///
+  ///   * [MaterialTapTargetSize], for a description of how this affects tap targets.
+  MaterialTapTargetSize get materialTapTargetSize;
 }
 
 /// An interface for material design chips that can be deleted.
@@ -424,6 +433,7 @@ class Chip extends StatelessWidget implements ChipAttributes, DeletableChipAttri
     this.shape,
     this.backgroundColor,
     this.padding,
+    this.materialTapTargetSize,
   })  : assert(label != null),
         super(key: key);
 
@@ -449,6 +459,8 @@ class Chip extends StatelessWidget implements ChipAttributes, DeletableChipAttri
   final Color deleteIconColor;
   @override
   final String deleteButtonTooltipMessage;
+  @override
+  final MaterialTapTargetSize materialTapTargetSize;
 
   @override
   Widget build(BuildContext context) {
@@ -466,6 +478,7 @@ class Chip extends StatelessWidget implements ChipAttributes, DeletableChipAttri
       shape: shape,
       backgroundColor: backgroundColor,
       padding: padding,
+      materialTapTargetSize: materialTapTargetSize,
       isEnabled: true,
     );
   }
@@ -548,6 +561,7 @@ class InputChip extends StatelessWidget
     this.shape,
     this.backgroundColor,
     this.padding,
+    this.materialTapTargetSize,
   })  : assert(selected != null),
         assert(isEnabled != null),
         assert(label != null),
@@ -589,6 +603,8 @@ class InputChip extends StatelessWidget
   final Color backgroundColor;
   @override
   final EdgeInsetsGeometry padding;
+  @override
+  final MaterialTapTargetSize materialTapTargetSize;
 
   @override
   Widget build(BuildContext context) {
@@ -612,6 +628,7 @@ class InputChip extends StatelessWidget
       shape: shape,
       backgroundColor: backgroundColor,
       padding: padding,
+      materialTapTargetSize: materialTapTargetSize,
       isEnabled: isEnabled && (onSelected != null || onDeleted != null || onPressed != null),
     );
   }
@@ -690,6 +707,7 @@ class ChoiceChip extends StatelessWidget
     this.shape,
     this.backgroundColor,
     this.padding,
+    this.materialTapTargetSize,
   })  : assert(selected != null),
         assert(label != null),
         super(key: key);
@@ -718,6 +736,8 @@ class ChoiceChip extends StatelessWidget
   final Color backgroundColor;
   @override
   final EdgeInsetsGeometry padding;
+  @override
+  final MaterialTapTargetSize materialTapTargetSize;
 
   @override
   bool get isEnabled => onSelected != null;
@@ -742,6 +762,7 @@ class ChoiceChip extends StatelessWidget
       backgroundColor: backgroundColor,
       padding: padding,
       isEnabled: isEnabled,
+      materialTapTargetSize: materialTapTargetSize,
     );
   }
 }
@@ -853,6 +874,7 @@ class FilterChip extends StatelessWidget
     this.shape,
     this.backgroundColor,
     this.padding,
+    this.materialTapTargetSize,
   })  : assert(selected != null),
         assert(label != null),
         super(key: key);
@@ -881,6 +903,8 @@ class FilterChip extends StatelessWidget
   final Color backgroundColor;
   @override
   final EdgeInsetsGeometry padding;
+  @override
+  final MaterialTapTargetSize materialTapTargetSize;
 
   @override
   bool get isEnabled => onSelected != null;
@@ -902,6 +926,7 @@ class FilterChip extends StatelessWidget
       selectedColor: selectedColor,
       padding: padding,
       isEnabled: isEnabled,
+      materialTapTargetSize: materialTapTargetSize,
     );
   }
 }
@@ -967,6 +992,7 @@ class ActionChip extends StatelessWidget implements ChipAttributes, TappableChip
     this.shape,
     this.backgroundColor,
     this.padding,
+    this.materialTapTargetSize,
   })  : assert(label != null),
         assert(
           onPressed != null,
@@ -993,6 +1019,8 @@ class ActionChip extends StatelessWidget implements ChipAttributes, TappableChip
   final Color backgroundColor;
   @override
   final EdgeInsetsGeometry padding;
+  @override
+  final MaterialTapTargetSize materialTapTargetSize;
 
   @override
   Widget build(BuildContext context) {
@@ -1008,6 +1036,7 @@ class ActionChip extends StatelessWidget implements ChipAttributes, TappableChip
       padding: padding,
       labelPadding: labelPadding,
       isEnabled: true,
+      materialTapTargetSize: materialTapTargetSize
     );
   }
 }
@@ -1077,6 +1106,7 @@ class RawChip extends StatefulWidget
     this.tooltip,
     this.shape,
     this.backgroundColor,
+    this.materialTapTargetSize,
   })  : assert(label != null),
         assert(isEnabled != null),
         deleteIcon = deleteIcon ?? _kDefaultDeleteIcon,
@@ -1118,6 +1148,8 @@ class RawChip extends StatefulWidget
   final Color backgroundColor;
   @override
   final EdgeInsetsGeometry padding;
+  @override
+  final MaterialTapTargetSize materialTapTargetSize;
 
   /// Whether or not to show a check mark when [selected] is true.
   ///
@@ -1429,7 +1461,7 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
         ),
       ),
     );
-    switch (theme.materialTapTargetSize) {
+    switch (widget.materialTapTargetSize ?? theme.materialTapTargetSize) {
       case MaterialTapTargetSize.padded:
         result = new ConstrainedBox(
           constraints: const BoxConstraints(minWidth: 48.0, minHeight: 48.0),
diff --git a/packages/flutter/lib/src/material/flat_button.dart b/packages/flutter/lib/src/material/flat_button.dart
index 4e3b395b73fb7..a816abd92365b 100644
--- a/packages/flutter/lib/src/material/flat_button.dart
+++ b/packages/flutter/lib/src/material/flat_button.dart
@@ -63,6 +63,7 @@ class FlatButton extends StatelessWidget {
     this.colorBrightness,
     this.padding,
     this.shape,
+    this.materialTapTargetSize,
     @required this.child,
   }) : super(key: key);
 
@@ -86,6 +87,7 @@ class FlatButton extends StatelessWidget {
     this.splashColor,
     this.colorBrightness,
     this.shape,
+    this.materialTapTargetSize,
     @required Widget icon,
     @required Widget label,
   }) : assert(icon != null),
@@ -186,6 +188,15 @@ class FlatButton extends StatelessWidget {
   /// Defaults to the theme's brightness, [ThemeData.brightness].
   final Brightness colorBrightness;
 
+  /// Configures the minimum size of the tap target.
+  ///
+  /// Defaults to [ThemeData.materialTapTargetSize].
+  ///
+  /// See also:
+  ///
+  ///   * [MaterialTapTargetSize], for a description of how this affects tap targets.
+  final MaterialTapTargetSize materialTapTargetSize;
+
   /// The widget below this widget in the tree.
   ///
   /// Typically a [Text] widget in all caps.
@@ -281,14 +292,6 @@ class FlatButton extends StatelessWidget {
     final ButtonThemeData buttonTheme = ButtonTheme.of(context);
     final Color fillColor = enabled ? color : disabledColor;
     final Color textColor = _getTextColor(theme, buttonTheme, fillColor);
-    BoxConstraints outerConstraints;
-    switch (theme.materialTapTargetSize) {
-      case MaterialTapTargetSize.padded:
-        outerConstraints = const BoxConstraints(minHeight: 48.0, minWidth: 48.0);
-        break;
-      case MaterialTapTargetSize.shrinkWrap:
-        break;
-    }
 
     return new RawMaterialButton(
       onPressed: onPressed,
@@ -299,7 +302,7 @@ class FlatButton extends StatelessWidget {
       splashColor: _getSplashColor(theme, buttonTheme),
       elevation: 0.0,
       highlightElevation: 0.0,
-      outerConstraints: outerConstraints,
+      materialTapTargetSize: materialTapTargetSize ?? theme.materialTapTargetSize,
       padding: padding ?? buttonTheme.padding,
       constraints: buttonTheme.constraints,
       shape: shape ?? buttonTheme.shape,
@@ -321,5 +324,6 @@ class FlatButton extends StatelessWidget {
     properties.add(new DiagnosticsProperty<Brightness>('colorBrightness', colorBrightness, defaultValue: null));
     properties.add(new DiagnosticsProperty<EdgeInsetsGeometry>('padding', padding, defaultValue: null));
     properties.add(new DiagnosticsProperty<ShapeBorder>('shape', shape, defaultValue: null));
+    properties.add(new DiagnosticsProperty<MaterialTapTargetSize>('materialTapTargetSize', materialTapTargetSize, defaultValue: null));
   }
 }
diff --git a/packages/flutter/lib/src/material/floating_action_button.dart b/packages/flutter/lib/src/material/floating_action_button.dart
index a7a6fd8949b7b..092bd599a429c 100644
--- a/packages/flutter/lib/src/material/floating_action_button.dart
+++ b/packages/flutter/lib/src/material/floating_action_button.dart
@@ -78,6 +78,7 @@ class FloatingActionButton extends StatefulWidget {
     this.mini = false,
     this.notchMargin = 4.0,
     this.shape = const CircleBorder(),
+    this.materialTapTargetSize,
     this.isExtended = false,
   }) :  assert(elevation != null),
         assert(highlightElevation != null),
@@ -105,6 +106,7 @@ class FloatingActionButton extends StatefulWidget {
     this.notchMargin = 4.0,
     this.shape = const StadiumBorder(),
     this.isExtended = true,
+    this.materialTapTargetSize,
     @required Widget icon,
     @required Widget label,
   }) :  assert(elevation != null),
@@ -223,6 +225,15 @@ class FloatingActionButton extends StatefulWidget {
   /// floating action buttons are scaled and faded in.
   final bool isExtended;
 
+  /// Configures the minimum size of the tap target.
+  ///
+  /// Defaults to [ThemeData.materialTapTargetSize].
+  ///
+  /// See also:
+  ///
+  ///   * [MaterialTapTargetSize], for a description of how this affects tap targets.
+  final MaterialTapTargetSize materialTapTargetSize;
+
   final BoxConstraints _sizeConstraints;
 
   @override
@@ -264,21 +275,12 @@ class _FloatingActionButtonState extends State<FloatingActionButton> {
       result = widget.child != null ? tooltip : new SizedBox.expand(child: tooltip);
     }
 
-    BoxConstraints outerConstraints;
-    switch (theme.materialTapTargetSize) {
-      case MaterialTapTargetSize.padded:
-        outerConstraints = const BoxConstraints(minHeight: 48.0, minWidth: 48.0);
-        break;
-      case MaterialTapTargetSize.shrinkWrap:
-        break;
-    }
-
     result = new RawMaterialButton(
       onPressed: widget.onPressed,
       onHighlightChanged: _handleHighlightChanged,
       elevation: _highlight ? widget.highlightElevation : widget.elevation,
       constraints: widget._sizeConstraints,
-      outerConstraints: widget.mini ? outerConstraints : null,
+      materialTapTargetSize: widget.materialTapTargetSize ?? theme.materialTapTargetSize,
       fillColor: widget.backgroundColor ?? theme.accentColor,
       textStyle: theme.accentTextTheme.button.copyWith(
         color: foregroundColor,
diff --git a/packages/flutter/lib/src/material/raised_button.dart b/packages/flutter/lib/src/material/raised_button.dart
index c9a94a5660364..f53c9915abbeb 100644
--- a/packages/flutter/lib/src/material/raised_button.dart
+++ b/packages/flutter/lib/src/material/raised_button.dart
@@ -63,6 +63,7 @@ class RaisedButton extends StatelessWidget {
     this.disabledElevation = 0.0,
     this.padding,
     this.shape,
+    this.materialTapTargetSize,
     this.animationDuration = kThemeChangeDuration,
     this.child,
   }) : assert(elevation != null),
@@ -95,6 +96,7 @@ class RaisedButton extends StatelessWidget {
     this.highlightElevation = 8.0,
     this.disabledElevation = 0.0,
     this.shape,
+    this.materialTapTargetSize,
     this.animationDuration = kThemeChangeDuration,
     @required Widget icon,
     @required Widget label,
@@ -290,6 +292,15 @@ class RaisedButton extends StatelessWidget {
   /// The default value is [kThemeChangeDuration].
   final Duration animationDuration;
 
+  /// Configures the minimum size of the tap target.
+  ///
+  /// Defaults to [ThemeData.materialTapTargetSize].
+  ///
+  /// See also:
+  ///
+  ///   * [MaterialTapTargetSize], for a description of how this affects tap targets.
+  final MaterialTapTargetSize materialTapTargetSize;
+
   Brightness _getBrightness(ThemeData theme) {
     return colorBrightness ?? theme.brightness;
   }
@@ -365,14 +376,6 @@ class RaisedButton extends StatelessWidget {
     final ButtonThemeData buttonTheme = ButtonTheme.of(context);
     final Color fillColor = _getFillColor(theme, buttonTheme);
     final Color textColor = _getTextColor(theme, buttonTheme, fillColor);
-    BoxConstraints outerConstraints;
-    switch (theme.materialTapTargetSize) {
-      case MaterialTapTargetSize.padded:
-        outerConstraints = const BoxConstraints(minHeight: 48.0, minWidth: 48.0);
-        break;
-      case MaterialTapTargetSize.shrinkWrap:
-        break;
-    }
 
     return new RawMaterialButton(
       onPressed: onPressed,
@@ -389,7 +392,7 @@ class RaisedButton extends StatelessWidget {
       shape: shape ?? buttonTheme.shape,
       animationDuration: animationDuration,
       child: child,
-      outerConstraints: outerConstraints
+      materialTapTargetSize: materialTapTargetSize ?? theme.materialTapTargetSize,
     );
   }
 
diff --git a/packages/flutter/test/material/raw_material_button_test.dart b/packages/flutter/test/material/raw_material_button_test.dart
index 16d326ebd180f..964b1f9ace9fc 100644
--- a/packages/flutter/test/material/raw_material_button_test.dart
+++ b/packages/flutter/test/material/raw_material_button_test.dart
@@ -5,7 +5,7 @@ import 'package:flutter_test/flutter_test.dart';
 import '../widgets/semantics_tester.dart';
 
 void main() {
-  testWidgets('outerConstraints expands hit test area', (WidgetTester tester) async {
+  testWidgets('materialTapTargetSize.padded expands hit test area', (WidgetTester tester) async {
     int pressed = 0;
 
     await tester.pumpWidget(new RawMaterialButton(
@@ -13,23 +13,23 @@ void main() {
         pressed++;
       },
       constraints: new BoxConstraints.tight(const Size(10.0, 10.0)),
-      outerConstraints: const BoxConstraints(minWidth: 100.0, minHeight: 100.0),
+      materialTapTargetSize: MaterialTapTargetSize.padded,
       child: const Text('+', textDirection: TextDirection.ltr),
     ));
 
-    await tester.tapAt(const Offset(100.0, 100.0));
+    await tester.tapAt(const Offset(40.0, 400.0));
 
     expect(pressed, 1);
   });
 
-  testWidgets('outerConstraints expands semantics area', (WidgetTester tester) async {
+  testWidgets('materialTapTargetSize.padded expands semantics area', (WidgetTester tester) async {
     final SemanticsTester semantics = new SemanticsTester(tester);
     await tester.pumpWidget(
       new Center(
         child: new RawMaterialButton(
           onPressed: () {},
           constraints: new BoxConstraints.tight(const Size(10.0, 10.0)),
-          outerConstraints: const BoxConstraints(minWidth: 100.0, minHeight: 100.0),
+          materialTapTargetSize: MaterialTapTargetSize.padded,
           child: const Text('+', textDirection: TextDirection.ltr),
         ),
       ),
@@ -50,7 +50,7 @@ void main() {
           ],
           label: '+',
           textDirection: TextDirection.ltr,
-          rect: Rect.fromLTRB(0.0, 0.0, 100.0, 100.0),
+          rect: Rect.fromLTRB(0.0, 0.0, 48.0, 48.0),
           children: <TestSemantics>[],
         ),
       ]

From a47e806bbc8fa17514979a40b6bb1d881e4a4da2 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Mon, 18 Jun 2018 12:26:31 -0700
Subject: [PATCH 29/33] add redirecting render object

---
 packages/flutter/lib/src/material/button.dart | 58 +++++++++++++------
 1 file changed, 41 insertions(+), 17 deletions(-)

diff --git a/packages/flutter/lib/src/material/button.dart b/packages/flutter/lib/src/material/button.dart
index 73f665a136975..7f1027b9895ce 100644
--- a/packages/flutter/lib/src/material/button.dart
+++ b/packages/flutter/lib/src/material/button.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/foundation.dart';
+import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
 
 import 'button_theme.dart';
@@ -187,22 +188,14 @@ class _RawMaterialButtonState extends State<RawMaterialButton> {
         ),
       ),
     );
-
-    if (widget.outerConstraints != null) {
-      result = new ConstrainedBox(
-        constraints: widget.outerConstraints,
-        child: new GestureDetector(
-          behavior: HitTestBehavior.translucent,
-          excludeFromSemantics: true,
-          onTap: widget.onPressed,
-          child: new Center(
-            child: result,
-            widthFactor: 1.0,
-            heightFactor: 1.0,
-          ),
-        ),
-      );
-    }
+    result = new _RedirectingHitDetectionWidget(
+      constraints: widget.outerConstraints ?? const BoxConstraints(),
+      child: new Center(
+        child: result,
+        widthFactor: 1.0,
+        heightFactor: 1.0,
+      ),
+    );
 
     return new Semantics(
       container: true,
@@ -404,7 +397,7 @@ class MaterialButton extends StatelessWidget {
     BoxConstraints outerConstraints;
     switch (theme.materialTapTargetSize) {
       case MaterialTapTargetSize.padded:
-        outerConstraints = const BoxConstraints(minHeight: 48.0, minWidth: 48.0);
+        outerConstraints = const BoxConstraints(minHeight: 248.0, minWidth: 148.0);
         break;
       case MaterialTapTargetSize.shrinkWrap:
         break;
@@ -435,3 +428,34 @@ class MaterialButton extends StatelessWidget {
     properties.add(new FlagProperty('enabled', value: enabled, ifFalse: 'disabled'));
   }
 }
+
+/// Redirects the position passed to [RenderBox.hitTest] to the center of the widget.
+///
+/// The primary purpose of this widget is to allow padding around [Material] widgets
+/// to trigger the child ink feature without increasing the size of the material.
+class _RedirectingHitDetectionWidget extends SingleChildRenderObjectWidget {
+  const _RedirectingHitDetectionWidget({this.constraints, Widget child}) : super(child: child);
+
+  final BoxConstraints constraints;
+
+  @override
+  RenderObject createRenderObject(BuildContext context) {
+    return _RedirectingHitDetectionRenderObject(constraints);
+  }
+
+  @override
+  void updateRenderObject(BuildContext context, covariant _RedirectingHitDetectionRenderObject renderObject) {
+    renderObject.additionalConstraints = constraints;
+  }
+}
+
+class _RedirectingHitDetectionRenderObject extends RenderConstrainedBox {
+  _RedirectingHitDetectionRenderObject(BoxConstraints additionalConstraints) : super(additionalConstraints: additionalConstraints);
+
+  @override
+  bool hitTest(HitTestResult result, {Offset position}) {
+    if (!size.contains(position))
+      return false;
+    return child.hitTest(result, position: size.center(Offset.zero));
+  }
+}

From 7e61552dc5e618fa841193a597325001a73c9b73 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Tue, 19 Jun 2018 13:57:55 -0700
Subject: [PATCH 30/33] Address comments

---
 packages/flutter/lib/src/material/button.dart | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/flutter/lib/src/material/button.dart b/packages/flutter/lib/src/material/button.dart
index a678cff7710dd..c712c119421fc 100644
--- a/packages/flutter/lib/src/material/button.dart
+++ b/packages/flutter/lib/src/material/button.dart
@@ -451,23 +451,27 @@ class MaterialButton extends StatelessWidget {
 /// The primary purpose of this widget is to allow padding around [Material] widgets
 /// to trigger the child ink feature without increasing the size of the material.
 class _RedirectingHitDetectionWidget extends SingleChildRenderObjectWidget {
-  const _RedirectingHitDetectionWidget({this.constraints, Widget child}) : super(child: child);
+  const _RedirectingHitDetectionWidget({
+    Key key,
+    Widget child,
+    this.constraints
+  }) : super(key: key, child: child);
 
   final BoxConstraints constraints;
 
   @override
   RenderObject createRenderObject(BuildContext context) {
-    return _RedirectingHitDetectionRenderObject(constraints);
+    return new  _RenderRedirectingHitDetection(constraints);
   }
 
   @override
-  void updateRenderObject(BuildContext context, covariant _RedirectingHitDetectionRenderObject renderObject) {
+  void updateRenderObject(BuildContext context, covariant  _RenderRedirectingHitDetection renderObject) {
     renderObject.additionalConstraints = constraints;
   }
 }
 
-class _RedirectingHitDetectionRenderObject extends RenderConstrainedBox {
-  _RedirectingHitDetectionRenderObject(BoxConstraints additionalConstraints) : super(additionalConstraints: additionalConstraints);
+class _RenderRedirectingHitDetection extends RenderConstrainedBox {
+  _RenderRedirectingHitDetection(BoxConstraints additionalConstraints) : super(additionalConstraints: additionalConstraints);
 
   @override
   bool hitTest(HitTestResult result, {Offset position}) {

From 190be7bace4dc94b7f34b53c3d01b59bb592e21e Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Tue, 19 Jun 2018 15:48:34 -0700
Subject: [PATCH 31/33] increase chip hit detection and address button comments

---
 packages/flutter/lib/src/material/button.dart |  14 +--
 packages/flutter/lib/src/material/chip.dart   | 107 ++++++++++++------
 2 files changed, 79 insertions(+), 42 deletions(-)

diff --git a/packages/flutter/lib/src/material/button.dart b/packages/flutter/lib/src/material/button.dart
index c712c119421fc..5d326c4c70fa4 100644
--- a/packages/flutter/lib/src/material/button.dart
+++ b/packages/flutter/lib/src/material/button.dart
@@ -203,7 +203,7 @@ class _RawMaterialButtonState extends State<RawMaterialButton> {
         constraints = const BoxConstraints();
         break;
     }
-    result = new _RedirectingHitDetectionWidget(
+    result = new _ButtonRedirectingHitDetectionWidget(
       constraints: constraints,
       child: new Center(
         child: result,
@@ -450,8 +450,8 @@ class MaterialButton extends StatelessWidget {
 ///
 /// The primary purpose of this widget is to allow padding around [Material] widgets
 /// to trigger the child ink feature without increasing the size of the material.
-class _RedirectingHitDetectionWidget extends SingleChildRenderObjectWidget {
-  const _RedirectingHitDetectionWidget({
+class _ButtonRedirectingHitDetectionWidget extends SingleChildRenderObjectWidget {
+  const _ButtonRedirectingHitDetectionWidget({
     Key key,
     Widget child,
     this.constraints
@@ -461,17 +461,17 @@ class _RedirectingHitDetectionWidget extends SingleChildRenderObjectWidget {
 
   @override
   RenderObject createRenderObject(BuildContext context) {
-    return new  _RenderRedirectingHitDetection(constraints);
+    return new _RenderButtonRedirectingHitDetection(constraints);
   }
 
   @override
-  void updateRenderObject(BuildContext context, covariant  _RenderRedirectingHitDetection renderObject) {
+  void updateRenderObject(BuildContext context, covariant _RenderButtonRedirectingHitDetection renderObject) {
     renderObject.additionalConstraints = constraints;
   }
 }
 
-class _RenderRedirectingHitDetection extends RenderConstrainedBox {
-  _RenderRedirectingHitDetection(BoxConstraints additionalConstraints) : super(additionalConstraints: additionalConstraints);
+class _RenderButtonRedirectingHitDetection extends RenderConstrainedBox {
+  _RenderButtonRedirectingHitDetection (BoxConstraints additionalConstraints) : super(additionalConstraints: additionalConstraints);
 
   @override
   bool hitTest(HitTestResult result, {Offset position}) {
diff --git a/packages/flutter/lib/src/material/chip.dart b/packages/flutter/lib/src/material/chip.dart
index deecb757ed6e9..9ac6524b5a6ac 100644
--- a/packages/flutter/lib/src/material/chip.dart
+++ b/packages/flutter/lib/src/material/chip.dart
@@ -1461,31 +1461,23 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
         ),
       ),
     );
+    BoxConstraints constraints;
     switch (widget.materialTapTargetSize ?? theme.materialTapTargetSize) {
       case MaterialTapTargetSize.padded:
-        result = new ConstrainedBox(
-          constraints: const BoxConstraints(minWidth: 48.0, minHeight: 48.0),
-          child: new Center(
-            child: result,
-            widthFactor: 1.0,
-            heightFactor: 1.0,
-          ),
-        );
-        if (canTap) {
-          result = new GestureDetector(
-            behavior: HitTestBehavior.translucent,
-            onTap: _handleTap,
-            onTapDown: _handleTapDown,
-            onTapCancel: _handleTapCancel,
-            child: result,
-            excludeFromSemantics: true,
-          );
-        }
+        constraints = const BoxConstraints(minHeight: 48.0);
         break;
       case MaterialTapTargetSize.shrinkWrap:
+        constraints = const BoxConstraints();
         break;
     }
-
+    result = _ChipRedirectingHitDetectionWidget(
+      constraints: constraints,
+      child: new Center(
+        child: result,
+        widthFactor: 1.0,
+        heightFactor: 1.0,
+      ),
+    );
     return new Semantics(
       container: true,
       selected: widget.selected,
@@ -1495,6 +1487,45 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
   }
 }
 
+/// Redirects the [position.dy] passed to [RenderBox.hitTest] to the vertical
+/// center of the widget.
+///
+/// The primary purpose of this widget is to allow padding around the [RawChip]
+/// to trigger the child ink feature without increasing the size of the material.
+class _ChipRedirectingHitDetectionWidget extends SingleChildRenderObjectWidget {
+  const _ChipRedirectingHitDetectionWidget({
+    Key key,
+    Widget child,
+    this.constraints,
+  }) : super(key: key, child: child);
+
+  final BoxConstraints constraints;
+
+  @override
+  RenderObject createRenderObject(BuildContext context) {
+    return new _RenderChipRedirectingHitDetection(constraints);
+  }
+
+  @override
+  void updateRenderObject(BuildContext context, covariant _RenderChipRedirectingHitDetection renderObject) {
+    renderObject.additionalConstraints = constraints;
+  }
+}
+
+class _RenderChipRedirectingHitDetection extends RenderConstrainedBox {
+  _RenderChipRedirectingHitDetection(BoxConstraints additionalConstraints) : super(additionalConstraints: additionalConstraints);
+
+  @override
+  bool hitTest(HitTestResult result, {Offset position}) {
+    if (!size.contains(position))
+      return false;
+    // Only redirects hit detection which occurs above and below the render object.
+    // In order to make this assumption true, I have removed the minimum width
+    // constraints, since any reasonable chip would be at least that wide.
+    return child.hitTest(result, position: new Offset(position.dx, size.height / 2));
+  }
+}
+
 class _ChipRenderWidget extends RenderObjectWidget {
   const _ChipRenderWidget({
     Key key,
@@ -1996,6 +2027,28 @@ class _RenderChip extends RenderBox {
     return new Size(deleteIconWidth, deleteIconHeight);
   }
 
+  @override
+  bool hitTest(HitTestResult result, {Offset position}) {
+    if (!size.contains(position))
+      return false;
+    RenderBox hitTestChild;
+    switch (textDirection) {
+      case TextDirection.ltr:
+        if (position.dx / size.width > 0.66)
+          hitTestChild = deleteIcon ?? label ?? avatar;
+        else
+          hitTestChild = label ?? avatar;
+        break;
+      case TextDirection.rtl:
+        if (position.dx / size.width < 0.33)
+          hitTestChild = deleteIcon ?? label ?? avatar;
+        else
+          hitTestChild = label ?? avatar;
+        break;
+    }
+    return hitTestChild?.hitTest(result, position: hitTestChild.size.center(Offset.zero)) ?? false;
+  }
+
   @override
   void performLayout() {
     final BoxConstraints contentConstraints = constraints.loosen();
@@ -2314,20 +2367,4 @@ class _RenderChip extends RenderBox {
 
   @override
   bool hitTestSelf(Offset position) => deleteButtonRect.contains(position) || pressRect.contains(position);
-
-  @override
-  bool hitTestChildren(HitTestResult result, {@required Offset position}) {
-    assert(position != null);
-    if (deleteIcon != null && deleteButtonRect.contains(position)) {
-      // This simulates a position at the center of the delete icon if the hit
-      // on the chip is inside of the delete area.
-      return deleteIcon.hitTest(result, position: (Offset.zero & _boxSize(deleteIcon)).center);
-    }
-    for (RenderBox child in _children) {
-      if (child.hasSize && child.hitTest(result, position: position - _boxParentData(child).offset)) {
-        return true;
-      }
-    }
-    return false;
-  }
 }

From df92deb2a54939784e596e6cbdc08b6d56c57680 Mon Sep 17 00:00:00 2001
From: jonahwilliams <campfish91@gmail.com>
Date: Thu, 21 Jun 2018 21:44:46 -0700
Subject: [PATCH 32/33] Add ink tests for raw material button

---
 .../material/raw_material_button_test.dart    | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/packages/flutter/test/material/raw_material_button_test.dart b/packages/flutter/test/material/raw_material_button_test.dart
index 964b1f9ace9fc..20654edc8047e 100644
--- a/packages/flutter/test/material/raw_material_button_test.dart
+++ b/packages/flutter/test/material/raw_material_button_test.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';
 
+import '../rendering/mock_canvas.dart';
 import '../widgets/semantics_tester.dart';
 
 void main() {
@@ -58,4 +59,57 @@ void main() {
 
     semantics.dispose();
   });
+
+  testWidgets('Ink splash from center tap originates in correct location', (WidgetTester tester) async {
+    const Color highlightColor = const Color(0xAAFF0000);
+    const Color splashColor = const Color(0xAA0000FF);
+    const Color fillColor = const Color(0xFFEF5350);
+
+    await tester.pumpWidget(
+      new RawMaterialButton(
+        materialTapTargetSize: MaterialTapTargetSize.padded,
+        onPressed: () {},
+        fillColor: fillColor,
+        highlightColor: highlightColor,
+        splashColor: splashColor,
+        child: const SizedBox(),
+      )
+    );
+
+    final Offset center = tester.getCenter(find.byType(InkWell));
+    final TestGesture gesture = await tester.startGesture(center);
+    await tester.pump(); // start gesture
+    await tester.pump(const Duration(milliseconds: 200)); // wait for splash to be well under way
+
+    final RenderBox box = Material.of(tester.element(find.byType(InkWell))) as dynamic;
+    // centered in material button.
+    expect(box, paints..circle(x: 44.0, y: 18.0, color: splashColor));
+    await gesture.up();
+  });
+
+  testWidgets('Ink splash from tap above material originates in correct location', (WidgetTester tester) async {
+    const Color highlightColor = const Color(0xAAFF0000);
+    const Color splashColor = const Color(0xAA0000FF);
+    const Color fillColor = const Color(0xFFEF5350);
+
+    await tester.pumpWidget(
+      new RawMaterialButton(
+        materialTapTargetSize: MaterialTapTargetSize.padded,
+        onPressed: () {},
+        fillColor: fillColor,
+        highlightColor: highlightColor,
+        splashColor: splashColor,
+        child: const SizedBox(),
+      )
+    );
+
+    final Offset top = tester.getRect(find.byType(InkWell)).topCenter;
+    final TestGesture gesture = await tester.startGesture(top);
+    await tester.pump(); // start gesture
+    await tester.pump(const Duration(milliseconds: 200)); // wait for splash to be well under way
+    final RenderBox box = Material.of(tester.element(find.byType(InkWell))) as dynamic;
+    // paints above above material
+    expect(box, paints..circle(x: 44.0, y: 0.0, color: splashColor));
+    await gesture.up();
+  });
 }
\ No newline at end of file

From 0145ffbf44d666e647c733f1ab71a87f68f463ed Mon Sep 17 00:00:00 2001
From: jonahwilliams <campfish91@gmail.com>
Date: Thu, 21 Jun 2018 22:47:44 -0700
Subject: [PATCH 33/33] add tests for material chip behavior

---
 packages/flutter/test/material/chip_test.dart | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/packages/flutter/test/material/chip_test.dart b/packages/flutter/test/material/chip_test.dart
index 742c1d840ccd7..f44e8b81c2aa5 100644
--- a/packages/flutter/test/material/chip_test.dart
+++ b/packages/flutter/test/material/chip_test.dart
@@ -1376,4 +1376,55 @@ void main() {
       semanticsTester.dispose();
     });
   });
+
+  testWidgets('can be tapped outside of chip delete icon', (WidgetTester tester) async {
+    bool deleted = false;
+    await tester.pumpWidget(
+      _wrapForChip(
+        child: new Row(
+          children: <Widget>[
+            new Chip(
+              materialTapTargetSize: MaterialTapTargetSize.padded,
+              shape: const RoundedRectangleBorder(borderRadius: const BorderRadius.all(const Radius.circular(0.0))),
+              avatar: const CircleAvatar(child: const Text('A')),
+              label: const Text('Chip A'),
+              onDeleted: () {
+                deleted = true;
+              },
+              deleteIcon: const Icon(Icons.delete),
+            ),
+          ],
+        ),
+      ),
+    );
+
+    await tester.tapAt(tester.getTopRight(find.byType(Chip)) - const Offset(2.0, -2.0));
+    await tester.pumpAndSettle();
+    expect(deleted, true);
+  });
+
+  testWidgets('can be tapped outside of chip body', (WidgetTester tester) async {
+    bool pressed = false;
+    await tester.pumpWidget(
+      _wrapForChip(
+        child: new Row(
+          children: <Widget>[
+            new InputChip(
+              materialTapTargetSize: MaterialTapTargetSize.padded,
+              shape: const RoundedRectangleBorder(borderRadius: const BorderRadius.all(const Radius.circular(0.0))),
+              avatar: const CircleAvatar(child: const Text('A')),
+              label: const Text('Chip A'),
+              onPressed: () {
+                pressed = true;
+              },
+            ),
+          ],
+        ),
+      ),
+    );
+
+    await tester.tapAt(tester.getRect(find.byType(InputChip)).topCenter);
+    await tester.pumpAndSettle();
+    expect(pressed, true);
+  });
 }