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

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

Merge "Change switch text color to black in dark mode" into qt-dev

parents 1abcbaa0 a2e73575
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@

    <style name="Theme.SubSettings" parent="Theme.SubSettings.Base"/>

    <style name="ThemeOverlay.SwitchBar.Settings" parent="ThemeOverlay.SwitchBar.Settings.Base">
        <item name="android:textColorPrimaryInverse">@android:color/black</item>
    </style>

    <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
        <item name="colorAccent">@*android:color/accent_device_default_dark</item>
        <item name="android:colorBackground">@color/dialog_background</item>
+3 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@
        <item name="android:backgroundDimEnabled">false</item>
    </style>

    <style name="ThemeOverlay.SwitchBar.Settings" parent="@*android:style/ThemeOverlay.DeviceDefault.ActionBar">
    <style name="ThemeOverlay.SwitchBar.Settings.Base" parent="@*android:style/ThemeOverlay.DeviceDefault.ActionBar">
        <item name="android:elevation">1dp</item>
        <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
        <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
@@ -99,6 +99,8 @@
        <item name="switchBarRestrictionIcon">@*android:drawable/ic_info</item>
    </style>

    <style name="ThemeOverlay.SwitchBar.Settings" parent="ThemeOverlay.SwitchBar.Settings.Base"/>

    <style name="Widget.SwitchBar.Switch" parent="@android:style/Widget.Material.CompoundButton.Switch">
        <item name="android:trackTint">@color/switchbar_switch_track_tint</item>
        <item name="android:thumbTint">@color/switchbar_switch_thumb_tint</item>