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

Commit cae16fa0 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Update switchbar background color in disabled state." into qt-dev

parents c4e7cf59 dd2efc00

res/values-night/colors.xml

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



<resources>

  <color name="switchbar_text_color">@android:color/black</color>

  <color name="switchbar_switch_track_tint">#82000000</color>

  <color name="switchbar_switch_thumb_tint">@android:color/black</color>

  <color name="homepage_accessibility_background">#783BE5</color>

res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ 
    <color name="contextual_card_background">@*android:color/background_device_default_light</color>

    <!-- End of dashboard/homepage icon background colors -->



    <color name="switchbar_text_color">@android:color/white</color>

    <color name="switchbar_background_color">@*android:color/material_grey_600</color>

    <color name="switchbar_switch_track_tint">#BFFFFFFF</color>

    <color name="switchbar_switch_thumb_tint">@android:color/white</color>

res/values/themes.xml

+2 −2
Original line number Diff line number Diff line
@@ -87,10 +87,10 @@ 
        <item name="android:backgroundDimEnabled">false</item>

    </style>



    <style name="ThemeOverlay.SwitchBar.Settings" parent="@android:style/ThemeOverlay.Material.ActionBar">

    <style name="ThemeOverlay.SwitchBar.Settings" parent="@*android:style/ThemeOverlay.DeviceDefault.ActionBar">

        <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>

        <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>

        <item name="switchBarBackgroundColor">?android:attr/textColorSecondary</item>

        <item name="switchBarBackgroundColor">@color/switchbar_background_color</item>

        <item name="switchBarBackgroundActivatedColor">?android:attr/colorAccent</item>

        <item name="switchBarRestrictionIcon">@*android:drawable/ic_info</item>

    </style>