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

Commit 8078882d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Alert Dialog should use the device default theme." into qt-dev

parents 748a2375 e436581c

res/values/styles.xml

+6 −6
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->

-->





<resources>

<resources>

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

     <style name="Theme.Telecomm.Transparent" parent="@android:style/Theme.DeviceDefault.Light">

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

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

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

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

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

        <item name="android:windowBackground">@android:color/transparent</item>
@@ -26,7 +26,7 @@ 
        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>

        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>

    </style>

    </style>





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

   <style name="Theme.Telecom.DialerSettings" parent="@android:style/Theme.DeviceDefault.Light">

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

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

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

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

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

        <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>
@@ -39,7 +39,7 @@ 
        <item name="android:windowContentOverlay">@null</item>

        <item name="android:windowContentOverlay">@null</item>

    </style>

    </style>





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

    <style name="Theme.Telecom.BlockedNumbers" parent="@android:style/Theme.DeviceDefault.Light">

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

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

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

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

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

        <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>
@@ -53,7 +53,7 @@ 
        <item name="android:listDivider">@null</item>

        <item name="android:listDivider">@null</item>

    </style>

    </style>





    <style name="TelecomDialerSettingsActionBarStyle" parent="android:Widget.Material.ActionBar">

    <style name="TelecomDialerSettingsActionBarStyle" parent="android:Widget.DeviceDefault.ActionBar">

        <item name="android:background">@color/background_color</item>

        <item name="android:background">@color/background_color</item>

        <item name="android:titleTextStyle">@style/BlockedNumbersTextHead1</item>

        <item name="android:titleTextStyle">@style/BlockedNumbersTextHead1</item>

        <item name="android:elevation">@dimen/dialer_settings_actionbar_elevation</item>

        <item name="android:elevation">@dimen/dialer_settings_actionbar_elevation</item>
@@ -62,7 +62,7 @@ 
    </style>

    </style>





    <style name="TelecomDialerSettingsActionOverflowButtonStyle"

    <style name="TelecomDialerSettingsActionOverflowButtonStyle"

            parent="@android:style/Widget.Material.Light.ActionButton.Overflow">

            parent="@android:style/Widget.DeviceDefault.Light.ActionButton.Overflow">

        <item name="android:src">@drawable/ic_more_vert_24dp</item>

        <item name="android:src">@drawable/ic_more_vert_24dp</item>

    </style>

    </style>
@@ -72,7 +72,7 @@ 
    </style>

    </style>





    <style name="BlockedNumbersTextHead1"

    <style name="BlockedNumbersTextHead1"

           parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">

           parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">

        <item name="android:textColor">@color/blocked_numbers_primary_text_color</item>

        <item name="android:textColor">@color/blocked_numbers_primary_text_color</item>

        <item name="android:textSize">@dimen/blocked_numbers_head1_font_size</item>

        <item name="android:textSize">@dimen/blocked_numbers_head1_font_size</item>

        <item name="android:fontFamily">sans-serif-regular</item>

        <item name="android:fontFamily">sans-serif-regular</item>