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

Commit 33b02ddf authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Update statusbar color,nav divider color of settings theme" 

am: 474d0ab6

Change-Id: Ife8d7d667b34c5b4faa610628f1014920e8e7948
parents 13a48e14 474d0ab6

core/res/res/values/colors_device_defaults.xml

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
    <color name="primary_dark_device_default_settings">@color/primary_dark_material_settings</color>

    <color name="primary_dark_device_default_settings_light">@color/primary_dark_material_settings_light</color>



    <color name="navigation_bar_divider_device_default_settings">#1f000000</color>



    <color name="secondary_device_default_settings">@color/secondary_material_settings</color>

    <color name="secondary_device_default_settings_light">@color/secondary_material_settings_light</color>

    <color name="tertiary_device_default_settings">@color/tertiary_material_settings</color>

core/res/res/values/themes_device_defaults.xml

+1 −1
Original line number Diff line number Diff line
@@ -1447,7 +1447,7 @@ easier. 
        <item name="colorEdgeEffect">@android:color/black</item>



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

        <item name="navigationBarDividerColor">#1f000000</item>

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

        <item name="navigationBarColor">@android:color/white</item>

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