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

Commit 6b33e208 authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge "Change color selector for segment button text"

parents 241d2f6f 7f7b8d5f

packages/SystemUI/res/color/segmented_button_text_selector.xml

+2 −4
Original line number Original line Diff line number Diff line
@@ -16,8 +16,6 @@ 
-->

-->





<selector xmlns:android="http://schemas.android.com/apk/res/android">

<selector xmlns:android="http://schemas.android.com/apk/res/android">



    <item android:state_selected="true" android:color="?android:attr/textColorPrimary"/>

    <item android:state_selected="true" android:color="@color/segmented_button_selected"/>

    <item android:alpha="0.58" android:color="?android:attr/colorForeground"/>

    <item android:color="@color/segmented_button_unselected"/>



</selector>
 
</selector>
 
 No newline at end of file

packages/SystemUI/res/values/colors.xml

+0 −2
Original line number Original line Diff line number Diff line
@@ -120,8 +120,6 @@ 
    <color name="screen_pinning_request_window_bg">#80000000</color>

    <color name="screen_pinning_request_window_bg">#80000000</color>





    <color name="segmented_buttons_background">#14FFFFFF</color><!-- 8% white -->

    <color name="segmented_buttons_background">#14FFFFFF</color><!-- 8% white -->

    <color name="segmented_button_selected">#FFFFFFFF</color>

    <color name="segmented_button_unselected">@*android:color/quaternary_device_default_settings</color>





    <color name="dark_mode_icon_color_single_tone">#99000000</color>

    <color name="dark_mode_icon_color_single_tone">#99000000</color>

    <color name="dark_mode_icon_color_dual_tone_background">#3d000000</color>

    <color name="dark_mode_icon_color_dual_tone_background">#3d000000</color>