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

Commit 687b8c4b authored by Raff Tsai's avatar Raff Tsai Committed by Android (Google) Code Review
Browse files

Merge "Fix layout issues"

parents 4ae89912 41435ad0

res/layout/preference_list_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
        android:visibility="gone" />



    <LinearLayout

        android:theme="@style/Theme.MaterialComponents.DayNight"

        android:theme="@style/Theme.TabTheme"

        android:id="@+id/tab_container"

        android:clipToPadding="true"

        android:clipChildren="true"

res/values-night/themes.xml

+4 −0
Original line number Diff line number Diff line
@@ -40,4 +40,8 @@ 
        <item name="android:colorBackground">@color/dialog_background</item>

    </style>



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

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

        <item name="colorPrimary">@*android:color/edge_effect_device_default_dark</item>

    </style>

</resources>

res/values/styles.xml

+2 −1
Original line number Diff line number Diff line
@@ -564,8 +564,9 @@ 
        <item name="android:showDividers">middle</item>

    </style>



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

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

        <item name="android:textAllCaps">false</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>

    </style>



    <style name="AccessibilityDialogServiceIcon">

res/values/themes.xml

+4 −0
Original line number Diff line number Diff line
@@ -253,4 +253,8 @@ 
        <item name="android:colorPrimaryDark">@android:color/white</item>

        <item name="android:colorAccent">@color/material_blue_700</item>

    </style>

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

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

        <item name="colorPrimary">@*android:color/edge_effect_device_default_light</item>

    </style>

</resources>