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

Commit 98e6c24a authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch '3859-P-actionBar_missing_issue' into 'v1-pie' 

3859-P-actionBar_missing_issue

See merge request !5
parents 2220b858 5e639742

res/values-night/styles.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<resources>

    <style name="AppBaseTheme" parent="@android:style/Theme.Material">

    </style>

</resources>

res/values/styles.xml

+5 −3
Original line number Diff line number Diff line
@@ -15,11 +15,13 @@ 
-->



<resources>

    <style name="AppBaseTheme" parent="@android:style/Theme.Material.Light">

    </style>



    <style name="Theme.Telecomm.Transparent" parent="Theme.Telecomm.Transparent.Base">

    </style>



    <style name="Theme.Telecomm.Transparent.Base" parent="Theme.AppCompat.DayNight">

    <style name="Theme.Telecomm.Transparent.Base" parent="AppBaseTheme">

        <item name="android:windowIsTranslucent">true</item>

        <item name="android:windowBackground">@android:color/transparent</item>

        <item name="android:windowContentOverlay">@null</item>
@@ -38,7 +40,7 @@ 
    <style name="Theme.Telecom.DialerSettings" parent="Theme.Telecom.DialerSettings.Base">

    </style>



    <style name="Theme.Telecom.DialerSettings.Base" parent="Theme.AppCompat.DayNight">

    <style name="Theme.Telecom.DialerSettings.Base" parent="AppBaseTheme">

        <item name="android:tint">@color/theme_color</item>

        <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>

        <item name="android:actionOverflowButtonStyle">@style/TelecomDialerSettingsActionOverflowButtonStyle</item>
@@ -59,7 +61,7 @@ 
    <style name="Theme.Telecom.BlockedNumbers" parent="Theme.Telecom.BlockedNumbers.Base">

    </style>



    <style name="Theme.Telecom.BlockedNumbers.Base" parent="Theme.AppCompat.DayNight">

    <style name="Theme.Telecom.BlockedNumbers.Base" parent="AppBaseTheme">

        <item name="android:tint">@color/theme_color</item>

        <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>

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