Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66dd6ee9 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

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

* commit 'e0d8a6ff':
  Update Material link text to be colorAccent
parents d14fa9b4 e0d8a6ff

core/res/res/values/colors_material.xml

+0 −3
Original line number Diff line number Diff line
@@ -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 />

core/res/res/values/themes_material.xml

+4 −8
Original line number Diff line number Diff line
@@ -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>