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

Commit 63386957 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Update ActionBar for using contentInsetStart 

- also align SwitchBar ON/OFF text

See bug: #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: Ie8224be169ac975b5f71ca23f0c87f385554878e
parent 238be024

res/values-sw600dp/dimens.xml

+5 −0
Original line number Diff line number Diff line
@@ -44,5 +44,10 @@ 


    <!-- SwitchBar padding start -->

    <dimen name="switchbar_padding_start">80dp</dimen>

    <!-- SwitchBar padding end -->

    <dimen name="switchbar_padding_end">80dp</dimen>



    <!-- ActionBar contentInsetStart -->

    <dimen name="actionbar_contentInsetStart">80dp</dimen>



</resources>

res/values/dimens.xml

+6 −3
Original line number Diff line number Diff line
@@ -94,8 +94,11 @@ 
    <dimen name="dashboard_category_title_height">48dp</dimen>



    <!-- SwitchBar padding start -->

    <dimen name="switchbar_padding_start">72dp</dimen>

    <!-- SwitchBar padding emd -->

    <dimen name="switchbar_padding_end">@*android:dimen/preference_fragment_padding_side</dimen>

    <dimen name="switchbar_padding_start">84dp</dimen>

    <!-- SwitchBar padding end. Should be 2 x @*android:dimen/preference_fragment_padding_side -->

    <dimen name="switchbar_padding_end">32dp</dimen>



    <!-- ActionBar contentInsetStart -->

    <dimen name="actionbar_contentInsetStart">84dp</dimen>



</resources>

res/values/themes.xml

+6 −0
Original line number Diff line number Diff line
@@ -89,6 +89,12 @@ 
        <!-- Used by the StatusBar and NavBar -->

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

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

        <!-- Redefine the ActionBar style for contentInsetStart -->

        <item name="android:actionBarStyle">@style/Theme.ActionBar</item>

    </style>



    <style name="Theme.ActionBar" parent="@android:style/Widget.Quantum.Light.ActionBar.Solid">

        <item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item>

    </style>



</resources>