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

Commit 0caac195 authored by Mill Chen's avatar Mill Chen Committed by android-build-merger
Browse files

Merge "Update Theme.DeviceDefault.Settings's colorEdgeEffect" into qt-dev 

am: 23ef465d

Change-Id: Icb2c52dd1f2daea3cdc31b9eda0f9d2c84359d06
parents 027fd454 23ef465d

core/res/res/values-night/themes_device_defaults.xml

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ easier. 
        <item name="colorPrimary">@color/primary_dark_device_default_settings</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>

        <item name="colorBackground">@color/primary_dark_device_default_settings</item>

        <item name="colorEdgeEffect">@color/edge_effect_device_default_dark</item>



        <item name="colorListDivider">@color/list_divider_color_dark</item>

        <item name="opacityListDivider">@color/list_divider_opacity_device_default_dark</item>

core/res/res/values/colors_device_defaults.xml

+3 −0
Original line number Diff line number Diff line
@@ -54,4 +54,7 @@ 
    <color name="loading_gradient_background_color_light">#DADCE0</color>

    <color name="loading_gradient_highlight_color_dark">#3C4043</color>

    <color name="loading_gradient_highlight_color_light">#F1F3F4</color>



    <color name="edge_effect_device_default_light">@android:color/black</color>

    <color name="edge_effect_device_default_dark">@android:color/white</color>

</resources>

core/res/res/values/themes_device_defaults.xml

+1 −1
Original line number Diff line number Diff line
@@ -1471,7 +1471,7 @@ easier. 
        <item name="colorSecondary">@color/secondary_device_default_settings_light</item>

        <item name="colorAccent">@color/accent_device_default_light</item>

        <item name="colorError">@color/error_color_device_default_light</item>

        <item name="colorEdgeEffect">@android:color/black</item>

        <item name="colorEdgeEffect">@color/edge_effect_device_default_light</item>



        <!-- Add white nav bar with divider that matches material -->

        <item name="navigationBarDividerColor">@color/navigation_bar_divider_device_default_settings</item>