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

Commit d2a50090 authored by Teo Georgescu's avatar Teo Georgescu Committed by Android (Google) Code Review
Browse files

Merge "[Settingslib] Fixed Preference background" into main

parents 29dc017f 8997f1ac

packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background.xml

+2 −6
Original line number Diff line number Diff line
@@ -19,16 +19,12 @@ 
    android:color="?android:colorControlHighlight">

    <item

        android:start="?android:attr/listPreferredItemPaddingStart"

        android:end="?android:attr/listPreferredItemPaddingEnd"

        android:top="2dp"

        android:bottom="16dp">

        android:end="?android:attr/listPreferredItemPaddingEnd">

        <shape android:shape="rectangle">

            <solid

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

            <corners

                android:radius="@dimen/settingslib_preference_corner_radius" />

            <padding

                android:bottom="16dp"/>

        </shape>

    </item>

</ripple>

packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_bottom.xml

+2 −6
Original line number Diff line number Diff line
@@ -19,9 +19,7 @@ 
    android:color="?android:colorControlHighlight">

    <item

        android:start="?android:attr/listPreferredItemPaddingStart"

        android:end="?android:attr/listPreferredItemPaddingEnd"

        android:top="2dp"

        android:bottom="16dp">

        android:end="?android:attr/listPreferredItemPaddingEnd">

        <shape android:shape="rectangle">

            <solid

                android:color="@color/settingslib_materialColorSurfaceBright" />
@@ -30,8 +28,6 @@ 
                android:bottomLeftRadius="@dimen/settingslib_preference_corner_radius"

                android:topRightRadius="4dp"

                android:bottomRightRadius="@dimen/settingslib_preference_corner_radius" />

            <padding

                android:bottom="16dp"/>

        </shape>

    </item>

</ripple>

packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_bottom_highlighted.xml

+2 −4
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
    <item

        android:bottom="16dp"

        android:end="?android:attr/listPreferredItemPaddingEnd"

        android:start="?android:attr/listPreferredItemPaddingStart"

        android:top="2dp">

        android:start="?android:attr/listPreferredItemPaddingStart">

        <shape

            android:shape="rectangle"

            android:tint="?android:attr/colorAccent">
@@ -29,7 +28,6 @@ 
                android:bottomRightRadius="@dimen/settingslib_preference_corner_radius"

                android:topLeftRadius="4dp"

                android:topRightRadius="4dp" />

            <padding android:bottom="16dp" />

            <solid android:color="#42000000" />

        </shape>

    </item>

packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_bottom_selected.xml

+2 −6
Original line number Diff line number Diff line
@@ -19,9 +19,7 @@ 
    android:color="?android:colorControlHighlight">

    <item

        android:start="?android:attr/listPreferredItemPaddingStart"

        android:end="?android:attr/listPreferredItemPaddingEnd"

        android:top="2dp"

        android:bottom="16dp">

        android:end="?android:attr/listPreferredItemPaddingEnd">

        <shape android:shape="rectangle">

            <solid

                android:color="@color/settingslib_materialColorSurfaceContainer" />
@@ -30,8 +28,6 @@ 
                android:bottomLeftRadius="@dimen/settingslib_preference_corner_radius"

                android:topRightRadius="4dp"

                android:bottomRightRadius="@dimen/settingslib_preference_corner_radius" />

            <padding

                android:bottom="16dp"/>

        </shape>

    </item>

</ripple>

packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_center.xml

+2 −3
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
    android:color="?android:colorControlHighlight">

    <item

        android:start="?android:attr/listPreferredItemPaddingStart"

        android:end="?android:attr/listPreferredItemPaddingEnd"

        android:top="2dp">

        android:end="?android:attr/listPreferredItemPaddingEnd">

        <shape android:shape="rectangle">

            <solid

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