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

Commit 5f60cbd4 authored by Doris Ling's avatar Doris Ling
Browse files

Revert some changes made in ag/5883994. 

- some settings theme customization has been removed. This revert part
of that change to add back some defined color to make the action bar
white again, and also restore the corner radius customization.

Bug: 117401043
Test: visual
Change-Id: Ia2209750d139e34a5c0d0aa2ca497a61e3d0b084
parent c0203f12

core/res/res/values/themes_device_defaults.xml

+12 −0
Original line number Diff line number Diff line
@@ -1454,12 +1454,17 @@ easier. 
        <item name="panelMenuListTheme">@style/Theme.Material.Settings.CompactMenu</item>



        <!-- action bar -->

        <item name="actionBarStyle">@style/Widget.DeviceDefault.Light.ActionBar.Solid</item>

        <item name="actionBarTheme">@style/ThemeOverlay.DeviceDefault.ActionBar</item>

        <item name="popupTheme">@style/ThemeOverlay.DeviceDefault.Popup.Light</item>



        <!-- Color palette -->

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

        <item name="colorPrimary">@color/primary_device_default_settings_light</item>

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

        <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>



        <!-- Add white nav bar with divider that matches material -->
@@ -1467,9 +1472,16 @@ easier. 
        <item name="navigationBarColor">@android:color/white</item>

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



        <!-- Dialog attributes -->

        <item name="dialogCornerRadius">@dimen/config_dialogCornerRadius</item>



        <!-- Button styles -->

        <item name="buttonCornerRadius">@dimen/config_buttonCornerRadius</item>

        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <item name="listDivider">@color/list_divider_color_light</item>

    </style>