DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Base theme's colorSecondary defaults to colorPrimary.

Browse Source 
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
This commit is contained in:
markwei 2017-08-10 15:50:03 -04:00 committed by Miguel Yanez Barreto
parent 6c84bf2a45
commit e02f108d03
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/res/values/colors.xml
View File

@ -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"/>

24
lib/res/values/themes_base.xml
View File

@ -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>