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

Commit c8d28ee0 authored by Edgar Wang's avatar Edgar Wang Committed by Automerger Merge Worker
Browse files

Merge "Update TabLayout background to align the latest spec" into tm-dev am: 9b7c98ce 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17527363



Change-Id: I91d3b2568dc1fa0627f3fe534b8aa4a28a4983d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6d0aa229 9b7c98ce

packages/SettingsLib/res/drawable-v31/settingslib_tabs_background.xml

+6 −2
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
        android:color="?android:colorControlHighlight">

    <item android:id="@android:id/mask">

        <inset

            android:insetTop="6dp"

            android:insetBottom="6dp"

            android:insetLeft="4dp"

            android:insetRight="4dp">

            <shape android:shape="rectangle">
@@ -29,6 +31,8 @@ 


    <item android:id="@android:id/background">

        <inset

            android:insetTop="6dp"

            android:insetBottom="6dp"

            android:insetLeft="4dp"

            android:insetRight="4dp">

            <shape android:shape="rectangle">

packages/SettingsLib/res/drawable-v31/settingslib_tabs_indicator_background.xml

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
     limitations under the License.

-->

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

       android:insetTop="6dp"

       android:insetBottom="6dp"

       android:insetLeft="4dp"

       android:insetRight="4dp">

    <shape android:shape="rectangle">