From e02f108d0353ff1e7d1cd4100697f15118b1e571 Mon Sep 17 00:00:00 2001
From: markwei <markwei@google.com>
Date: Thu, 10 Aug 2017 15:50:03 -0400
Subject: [PATCH] Base theme's colorSecondary defaults to colorPrimary.

This allows an app theme to only define colorPrimary variants, and get have that be applied by default to all controls.
Legacy apps overwrite colorAccent, which controls will still honor.

PiperOrigin-RevId: 164890003
---
 lib/res/values/colors.xml      |  1 -
 lib/res/values/themes_base.xml | 24 ++++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/lib/res/values/colors.xml b/lib/res/values/colors.xml
index de47525da..b223e0437 100644
--- a/lib/res/values/colors.xml
+++ b/lib/res/values/colors.xml
@@ -19,7 +19,6 @@
 
   <color name="design_default_color_primary">#3F51B5</color>
   <color name="design_default_color_primary_dark">#303F9F</color>
-  <color name="design_default_color_secondary">#FF4081</color>
   <array name="design_default_color_palette_primary"/>
   <array name="design_default_color_palette_secondary"/>
 
diff --git a/lib/res/values/themes_base.xml b/lib/res/values/themes_base.xml
index 35fd66012..902116f11 100644
--- a/lib/res/values/themes_base.xml
+++ b/lib/res/values/themes_base.xml
@@ -41,9 +41,9 @@
     <item name="colorPrimaryLight">?attr/colorPrimary</item>
     <item name="colorPrimaryDark">@color/design_default_color_primary_dark</item>
 
-    <item name="colorSecondary">@color/design_default_color_secondary</item>
-    <item name="colorSecondaryLight">?attr/colorSecondary</item>
-    <item name="colorSecondaryDark">?attr/colorSecondary</item>
+    <item name="colorSecondary">?attr/colorPrimary</item>
+    <item name="colorSecondaryLight">?attr/colorPrimaryLight</item>
+    <item name="colorSecondaryDark">?attr/colorPrimaryDark</item>
 
     <item name="colorAccent">?attr/colorSecondary</item>
 
@@ -61,9 +61,9 @@
     <item name="colorPrimaryLight">?attr/colorPrimary</item>
     <item name="colorPrimaryDark">@color/design_default_color_primary_dark</item>
 
-    <item name="colorSecondary">@color/design_default_color_secondary</item>
-    <item name="colorSecondaryLight">?attr/colorSecondary</item>
-    <item name="colorSecondaryDark">?attr/colorSecondary</item>
+    <item name="colorSecondary">?attr/colorPrimary</item>
+    <item name="colorSecondaryLight">?attr/colorPrimaryLight</item>
+    <item name="colorSecondaryDark">?attr/colorPrimaryDark</item>
 
     <item name="colorAccent">?attr/colorSecondary</item>
 
@@ -81,9 +81,9 @@
     <item name="colorPrimaryLight">?attr/colorPrimary</item>
     <item name="colorPrimaryDark">@color/design_default_color_primary_dark</item>
 
-    <item name="colorSecondary">@color/design_default_color_secondary</item>
-    <item name="colorSecondaryLight">?attr/colorSecondary</item>
-    <item name="colorSecondaryDark">?attr/colorSecondary</item>
+    <item name="colorSecondary">?attr/colorPrimary</item>
+    <item name="colorSecondaryLight">?attr/colorPrimaryLight</item>
+    <item name="colorSecondaryDark">?attr/colorPrimaryDark</item>
 
     <item name="colorAccent">?attr/colorSecondary</item>
 
@@ -101,9 +101,9 @@
     <item name="colorPrimaryLight">?attr/colorPrimary</item>
     <item name="colorPrimaryDark">@color/design_default_color_primary_dark</item>
 
-    <item name="colorSecondary">@color/design_default_color_secondary</item>
-    <item name="colorSecondaryLight">?attr/colorSecondary</item>
-    <item name="colorSecondaryDark">?attr/colorSecondary</item>
+    <item name="colorSecondary">?attr/colorPrimary</item>
+    <item name="colorSecondaryLight">?attr/colorPrimaryLight</item>
+    <item name="colorSecondaryDark">?attr/colorPrimaryDark</item>
 
     <item name="colorAccent">?attr/colorSecondary</item>