From 66b50ed02bd25d4e6d2b200788c82e6ea7dbb07a Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Wed, 23 May 2018 12:56:28 -0700
Subject: [PATCH] Default toggleableActiveColor to accentColor if not set
 (#17848)

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

diff --git a/packages/flutter/lib/src/material/theme_data.dart b/packages/flutter/lib/src/material/theme_data.dart
index ab211c9989..945dfe262a 100644
--- a/packages/flutter/lib/src/material/theme_data.dart
+++ b/packages/flutter/lib/src/material/theme_data.dart
@@ -114,8 +114,8 @@ class ThemeData extends Diagnosticable {
     primaryColorLight ??= isDark ? Colors.grey[500] : primarySwatch[100];
     primaryColorDark ??= isDark ? Colors.black : primarySwatch[700];
     final bool primaryIsDark = primaryColorBrightness == Brightness.dark;
+    toggleableActiveColor ??= isDark ? Colors.tealAccent[200] : (accentColor ?? primarySwatch[600]);
     accentColor ??= isDark ? Colors.tealAccent[200] : primarySwatch[500];
-    toggleableActiveColor ??= isDark ? Colors.tealAccent[200] : primarySwatch[600];
     accentColorBrightness ??= estimateBrightnessForColor(accentColor);
     final bool accentIsDark = accentColorBrightness == Brightness.dark;
     canvasColor ??= isDark ? Colors.grey[850] : Colors.grey[50];