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

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

Merge "Remove hardcode color of sliding tab"

parents 29147e5f 4f5e4931
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@

<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_selected="false"
          android:color="#b3ffffff"/>
    <item android:color="@android:color/white"/>
          android:color="?android:attr/textColorSecondary"/>
    <item android:color="?android:attr/textColorPrimary"/>
</selector>
+1 −3
Original line number Diff line number Diff line
@@ -16,10 +16,8 @@

<com.android.settings.widget.SlidingTabLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/sliding_tabs"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_marginStart="@dimen/dashboard_header_margin_start"
    android:layout_marginEnd="@dimen/dashboard_header_margin_end"
    android:background="?android:attr/colorPrimary"/>
    android:layout_marginEnd="@dimen/dashboard_header_margin_end"/>
+2 −1
Original line number Diff line number Diff line
@@ -27,4 +27,5 @@
    android:maxLines="1"
    android:padding="@dimen/pager_tabs_title_padding"
    android:textColor="@color/sliding_tab_title_text_color"
    android:textAllCaps="true"/>
    android:textAllCaps="true"
    android:theme="?android:attr/actionBarTheme"/>