Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7b4170fa: Merge "Update Material link text to be colorAccent" into mnc-dev

Browse Source 
* commit '7b4170fa7f944e4cd73f1e82b56b4467de60d96c':
  Update Material link text to be colorAccent
This commit is contained in:
Alan Viverette
2015-08-03 20:33:05 +00:00
committed by Android Git Automerger
parent 3f9b9f2bbe 7b4170fa7f
commit e0d8a6ff60
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/colors_material.xml
View File

@@ -41,9 +41,6 @@
<color name="switch_thumb_disabled_material_dark">#ff616161</color>
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
<color name="link_text_material_light">@color/material_deep_teal_500</color>
<color name="link_text_material_dark">@color/material_deep_teal_200</color>
<!-- Text & foreground colors -->
<eat-comment />

12
core/res/res/values/themes_material.xml
View File

@@ -67,8 +67,8 @@ please see themes_device_defaults.xml.
<item name="textColorHintInverse">@color/hint_foreground_material_light</item>
<item name="textColorHighlight">@color/highlighted_text_material</item>
<item name="textColorHighlightInverse">@color/highlighted_text_material</item>
<item name="textColorLink">@color/link_text_material_dark</item>
<item name="textColorLinkInverse">@color/link_text_material_light</item>
<item name="textColorLink">?attr/colorAccent</item>
<item name="textColorLinkInverse">?attr/colorAccent</item>
<item name="textColorSearchUrl">@color/search_url_text_material_dark</item>
<item name="textColorAlertDialogListItem">@color/primary_text_material_dark</item>
@@ -422,8 +422,8 @@ please see themes_device_defaults.xml.
<item name="textColorHintInverse">@color/hint_foreground_material_dark</item>
<item name="textColorHighlight">@color/highlighted_text_material</item>
<item name="textColorHighlightInverse">@color/highlighted_text_material</item>
<item name="textColorLink">@color/link_text_material_light</item>
<item name="textColorLinkInverse">@color/link_text_material_dark</item>
<item name="textColorLink">?attr/colorAccent</item>
<item name="textColorLinkInverse">?attr/colorAccent</item>
<item name="textColorSearchUrl">@color/search_url_text_material_light</item>
<item name="textColorAlertDialogListItem">@color/primary_text_material_light</item>
@@ -793,8 +793,6 @@ please see themes_device_defaults.xml.
<item name="textColorHintInverse">@color/hint_foreground_material_dark</item>
<item name="textColorHighlight">@color/highlighted_text_material</item>
<item name="textColorHighlightInverse">@color/highlighted_text_material</item>
<item name="textColorLink">@color/link_text_material_light</item>
<item name="textColorLinkInverse">@color/link_text_material_dark</item>
<item name="textColorSearchUrl">@color/search_url_text_material_light</item>
<item name="textColorAlertDialogListItem">@color/primary_text_material_light</item>
@@ -827,8 +825,6 @@ please see themes_device_defaults.xml.
<item name="textColorHintInverse">@color/hint_foreground_material_light</item>
<item name="textColorHighlight">@color/highlighted_text_material</item>
<item name="textColorHighlightInverse">@color/highlighted_text_material</item>
<item name="textColorLink">@color/link_text_material_dark</item>
<item name="textColorLinkInverse">@color/link_text_material_light</item>
<item name="textColorSearchUrl">@color/search_url_text_material_dark</item>
<item name="textColorAlertDialogListItem">@color/primary_text_material_dark</item>