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

Commit f173ccdf authored by Alex Kershaw's avatar Alex Kershaw
Browse files

Change DocsUI tabs styling to be consistent with other surfaces 

Change DocsUI tabs styling to be consistent with share sheet, Settings,
and launcher.

Fixes: 149737528
Bug: 150286830
Test: manual
Change-Id: I3456d32b88dbdcb6023d13165daecbf87419482b
parent 9d57eb5a

res/layout/directory_header.xml

+28 −4
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
     limitations under the License.

-->

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

              xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginTop="@dimen/action_bar_space_margin"
@@ -28,11 +29,34 @@ 
    <!-- used for search chip. -->

    <include layout="@layout/search_chip_row"/>



    <LinearLayout

        android:id="@+id/tabs_container"

        android:theme="@style/TabTheme"

        android:clipToPadding="true"

        android:clipChildren="true"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical">



        <com.google.android.material.tabs.TabLayout

            android:id="@+id/tabs"

            android:background="@android:color/transparent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

        android:visibility="gone"/>

            android:layoutDirection="ltr"

            app:tabMaxWidth="0dp"

            app:tabGravity="fill"

            app:tabMode="fixed"

            app:tabIndicatorColor="@color/tab_indicator_color"

            app:tabSelectedTextColor="@color/tab_indicator_color"

            app:tabTextAppearance="@style/TabTextAppearance"

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



        <View

            android:layout_width="match_parent"

            android:layout_height="1dp"

            android:background="?android:attr/listDivider"/>

    </LinearLayout>



    <!-- used for apps row. -->

    <include layout="@layout/apps_row"/>

res/values-night/themes.xml

+5 −0
Original line number Diff line number Diff line
@@ -41,4 +41,9 @@ 
        <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>



    </style>



    <!-- Material theme for the pages containing TabLayout and ViewPager -->

    <style name="TabTheme" parent="@style/Theme.MaterialComponents.DayNight">

        <item name="colorPrimary">@color/edge_effect_dark</item>

    </style>

</resources>

res/values/colors.xml

+4 −0
Original line number Diff line number Diff line
@@ -46,4 +46,8 @@ 
    <color name="cross_profile_button_text_color">#1A73E8</color>

    <color name="empty_state_text">#202124</color>

    <color name="error_image_color">#757575</color>



    <color name="tab_indicator_color">#1A73E8</color> <!-- Blue 600 -->

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

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

</resources>

res/values/styles_text.xml

+5 −0
Original line number Diff line number Diff line
@@ -114,4 +114,9 @@ 
        <item name="fontFamily">@string/config_fontFamilyMedium</item>

    </style>



    <style name="TabTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textSize">14sp</item>

        <item name="fontFamily">@string/config_fontFamilyMedium</item>

    </style>



</resources>
 
 No newline at end of file

res/values/themes.xml

+4 −0
Original line number Diff line number Diff line
@@ -72,4 +72,8 @@ 
        <item name="queryBackground">@color/menu_search_background</item>

        <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>

    </style>



    <style name="TabTheme" parent="@style/Theme.MaterialComponents.DayNight">

        <item name="colorPrimary">@color/edge_effect_light</item>

    </style>

</resources>