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

Commit 46907dd2 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Use Quantum Theme for the ActionBar"

parents b2d5e810 dfeb64df

res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -60,5 +60,6 @@ 
    <color name="quantum_orange_A200">#ffffab40</color>

    <color name="quantum_orange_A400">#ffff9100</color>



    <color name="actionbar_background_color">#ff263238</color>

    <color name="dashboard_background_color">#ffe1e1e0</color>

</resources>

res/values/themes.xml

+15 −1
Original line number Diff line number Diff line
@@ -71,9 +71,23 @@ 
        <item name="ic_wps">@drawable/ic_wps_dark</item>

        <item name="wifi_signal">@drawable/wifi_signal_dark</item>



        <item name="android:actionBarTheme">@style/Theme.Settings.ActionBar.Quantum</item>



        <item name="android:colorPrimary">@color/actionbar_background_color</item>

        <item name="android:colorPrimaryLight">@color/quantum_blue_grey_100</item>

        <item name="android:colorPrimary">@color/quantum_blue_grey_500</item>

        <item name="android:colorPrimaryDark">@color/quantum_blue_grey_700</item>

        <item name="android:colorAccent">@color/quantum_orange_A200</item>

    </style>



    <style name="Theme.Settings.ActionBar.Quantum" parent="@android:style/Theme.Quantum">

        <!--Set the background color-->

        <item name="android:colorPrimary">@color/actionbar_background_color</item>

        <!--Set the activated state color for the on/off switches-->

        <item name="android:colorControlActivated">?android:attr/colorControlNormal</item>

        <!--Other colors-->

        <item name="android:colorPrimaryLight">@color/quantum_blue_grey_100</item>

        <item name="android:colorPrimaryDark">@color/quantum_blue_grey_700</item>

        <item name="android:colorAccent">@color/quantum_orange_A200</item>

    </style>



</resources>