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

Commit dfb96c64 authored by Shubham Basu's avatar Shubham Basu Committed by Android (Google) Code Review
Browse files

Merge "fix: work profile tab color change" into sc-mainline-prod

parents f3afc163 b2b7c163

res/color/profile_tab_selector.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:state_selected="true"

        android:color="?android:attr/colorAccent"/>

        android:color="@color/profile_tab_selected_color"/>

    <item

        android:color="@color/tab_default_background_color"/>

        android:color="@color/profile_tab_default_color"/>

</selector>

res/layout/directory_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
            app:tabIndicatorHeight="@dimen/tab_selector_indicator_height"

            app:tabSelectedTextColor="@color/tab_selected_text_color"

            app:tabTextAppearance="@style/TabTextAppearance"

            app:tabTextColor="?android:attr/textColorSecondary"/>

            app:tabTextColor="@color/tab_unselected_text_color"/>

        <View

            android:id="@+id/tab_separator"

            android:layout_width="match_parent"

res/values-night-v31/colors.xml

+9 −3
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ 


<resources>

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

  <color name="tab_default_background_color">

    @*android:color/system_neutral1_800

  </color> <!-- neutral 800 -->

  <color name="work_profile_button_stroke_color">

    @*android:color/system_accent1_200

  </color> <!-- accent 200 -->
@@ -26,4 +23,13 @@ 
  <color name="empty_state_message_text_color">@*android:color/system_neutral2_200

  </color>

  <!-- neutral variant 200 -->

  <color name="tab_unselected_text_color">@*android:color/system_neutral2_200

  </color>

  <!-- neutral variant 200 -->

  <color name="profile_tab_default_color">@*android:color/system_neutral1_800

  </color>

  <!-- neutral 800 -->

  <color name="profile_tab_selected_color">@*android:color/system_neutral2_100

  </color>

  <!-- neutral variant 100 -->

</resources>

res/values-v31/colors.xml

+12 −1
Original line number Diff line number Diff line
@@ -14,7 +14,12 @@ 
-->



<resources>

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

  <color name="tab_selected_text_color">@*android:color/system_neutral1_900

  </color>

  <!-- neutral 900 -->

  <color name="tab_unselected_text_color">@*android:color/system_neutral2_700

  </color>

  <!-- neutral variant 700-->

  <color name="work_profile_button_stroke_color">

    @*android:color/system_accent1_600

  </color> <!-- primary 600 -->
@@ -23,4 +28,10 @@ 
  <color name="empty_state_message_text_color">@*android:color/system_neutral2_700

  </color>

  <!-- neutral variant 700 -->

  <color name="profile_tab_selected_color">@*android:color/system_accent1_100

  </color>

  <!-- accent 100 -->

  <color name="profile_tab_default_color">@*android:color/system_neutral1_100

  </color>

  <!-- neutral 100 -->

</resources>

res/values/colors.xml

+3 −2
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ 
    <color name="color_surface_header">@color/app_background_color</color>



    <color name="tab_selected_text_color">@color/primary</color>

    <color name="tab_default_background_color">#E0E0E0</color>



    <color name="work_profile_button_stroke_color">@color/primary</color>

    <color name="profile_tab_selected_color">?android:attr/colorAccent</color>

    <color name="profile_tab_default_color">#E0E0E0</color>

    <color name="tab_unselected_text_color">#5F6368</color> <!-- Gray 700 -->

</resources>