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

Commit 827ff401 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Set folder dot color to spec." into sc-dev

parents 4716ab30 9b4448f4

res/values-v31/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -37,4 +37,6 @@ 


    <color name="wallpaper_popup_scrim">@android:color/system_neutral1_900</color>



    <color name="folder_dot_color">@android:color/system_accent2_50</color>



</resources>

res/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ 
    <color name="folder_hint_text_color_light">#FFF</color>

    <color name="folder_hint_text_color_dark">#FF000000</color>



    <color name="folder_dot_color">?attr/colorPrimary</color>



    <color name="text_color_primary_dark">#FFFFFFFF</color>

    <color name="text_color_secondary_dark">#FFFFFFFF</color>

    <color name="text_color_tertiary_dark">#CCFFFFFF</color>

res/values/styles.xml

+3 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
        <item name="workspaceKeyShadowColor">#89000000</item>

        <item name="workspaceStatusBarScrim">@drawable/workspace_bg</item>

        <item name="widgetsTheme">@style/WidgetContainerTheme</item>

        <item name="folderDotColor">?android:attr/colorPrimary</item>

        <item name="folderDotColor">@color/folder_dot_color</item>

        <item name="folderFillColor">?android:attr/colorBackgroundFloating</item>

        <item name="folderIconBorderColor">?android:attr/colorPrimary</item>

        <item name="folderTextColor">?android:attr/textColorPrimary</item>
@@ -86,7 +86,7 @@ 
        <item name="workspaceKeyShadowColor">@android:color/transparent</item>

        <item name="isWorkspaceDarkText">true</item>

        <item name="workspaceStatusBarScrim">@null</item>

        <item name="folderDotColor">#FF464646</item>

        <item name="folderDotColor">@color/folder_dot_color</item>

        <item name="folderFillColor">?android:attr/colorBackgroundFloating</item>

        <item name="folderIconBorderColor">#FF80868B</item>

        <item name="folderTextColor">?attr/workspaceTextColor</item>
@@ -108,7 +108,7 @@ 
        <item name="popupColorSecondary">@color/popup_color_secondary_dark</item>

        <item name="popupColorTertiary">@color/popup_color_tertiary_dark</item>

        <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>

        <item name="folderDotColor">?android:attr/colorPrimary</item>

        <item name="folderDotColor">@color/folder_dot_color</item>

        <item name="folderFillColor">?android:attr/colorBackgroundFloating</item>

        <item name="folderIconBorderColor">?android:attr/colorPrimary</item>

        <item name="folderTextColor">?android:attr/textColorPrimary</item>