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

Commit dda671cf authored by Doris Ling's avatar Doris Ling
Browse files

Update device default theme for action bar. 

- Use the standard primary text color instead of accent color.
- update the tint color for the settings search icon to match the new
theme.

Bug: 117401043
Test: visual
Change-Id: I7b115e5ad72c2a6659696ad74a879cb9f1321ce6
parent 60e2c5f0

core/res/res/values/themes_device_defaults.xml

+3 −6
Original line number Original line Diff line number Diff line
@@ -1442,7 +1442,7 @@ easier. 
    <style name="Theme.DeviceDefault.Settings" parent="Theme.Material.Settings">

    <style name="Theme.DeviceDefault.Settings" parent="Theme.Material.Settings">

        <!-- action bar -->

        <!-- action bar -->

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

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

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

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

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

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





        <!-- Color palette -->

        <!-- Color palette -->
@@ -1678,11 +1678,8 @@ easier. 




    <style name="ThemeOverlay.DeviceDefault" />

    <style name="ThemeOverlay.DeviceDefault" />





    <!-- @hide Theme overlay that inherits from material actionbar, and use accent color for

    <!-- @hide Theme overlay that inherits from material actionbar -->

             primary text -->

    <style name="ThemeOverlay.DeviceDefault.ActionBar" parent="ThemeOverlay.Material.ActionBar" />

    <style name="ThemeOverlay.DeviceDefault.ActionBar.Accent" parent="ThemeOverlay.Material.ActionBar">

        <item name="textColorPrimary">@color/btn_colored_borderless_text_material</item>

    </style>





    <!-- @hide Theme overlay for a light popup in action bar -->

    <!-- @hide Theme overlay for a light popup in action bar -->

    <style name="ThemeOverlay.DeviceDefault.Popup.Light" parent="@style/ThemeOverlay.Material.Light" />

    <style name="ThemeOverlay.DeviceDefault.Popup.Light" parent="@style/ThemeOverlay.Material.Light" />

packages/SettingsLib/SearchWidget/res/drawable/ic_search_24dp.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ 
        android:height="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportWidth="24"

        android:viewportHeight="24"

        android:viewportHeight="24"

        android:tint="?android:attr/colorAccent">

        android:tint="?android:attr/colorControlNormal">

    <path

    <path

        android:fillColor="#FF000000"

        android:fillColor="#FF000000"

        android:pathData="M20.49,19l-5.73,-5.73C15.53,12.2 16,10.91 16,9.5C16,5.91 13.09,3 9.5,3S3,5.91 3,9.5C3,13.09 5.91,16 9.5,16c1.41,0 2.7,-0.47 3.77,-1.24L19,20.49L20.49,19zM5,9.5C5,7.01 7.01,5 9.5,5S14,7.01 14,9.5S11.99,14 9.5,14S5,11.99 5,9.5z"/>

        android:pathData="M20.49,19l-5.73,-5.73C15.53,12.2 16,10.91 16,9.5C16,5.91 13.09,3 9.5,3S3,5.91 3,9.5C3,13.09 5.91,16 9.5,16c1.41,0 2.7,-0.47 3.77,-1.24L19,20.49L20.49,19zM5,9.5C5,7.01 7.01,5 9.5,5S14,7.01 14,9.5S11.99,14 9.5,14S5,11.99 5,9.5z"/>