Fix some TabBarTheme mergeOs (#22285)

63efe4c4 · Hans Muller · GitHub · 52697ef9 · 63efe4c4
Unverified Commit 63efe4c4 authored Sep 26, 2018 by Hans Muller Committed by GitHub Sep 26, 2018
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

theme_data.dart packages/flutter/lib/src/material/theme_data.dart +2 -3

No files found.
--- a/packages/flutter/lib/src/material/theme_data.dart
+++ b/packages/flutter/lib/src/material/theme_data.dart
@@ -187,7 +187,6 @@ class ThemeData extends Diagnosticable {
    errorColor ??= Colors.red[700];
    inputDecorationTheme ??= const InputDecorationTheme();
    pageTransitionsTheme ??= const PageTransitionsTheme();
-  tabBarTheme ??= const TabBarTheme();
    primaryIconTheme ??= primaryIsDark ? const IconThemeData(color: Colors.white) : const IconThemeData(color: Colors.black);
    accentIconTheme ??= accentIsDark ? const IconThemeData(color: Colors.white) : const IconThemeData(color: Colors.black);
    iconTheme ??= isDark ? const IconThemeData(color: Colors.white) : const IconThemeData(color: Colors.black87);
@@ -894,12 +893,12 @@ class ThemeData extends Diagnosticable {
        primaryIconTheme,
        accentIconTheme,
        sliderTheme,
-        chipTheme,
+        tabBarTheme,
        hashValues(
+          chipTheme,
          platform,
          materialTapTargetSize,
          pageTransitionsTheme,
-          tabBarTheme,
        ),
      ),
    );