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

Commit f6ab176e authored by Bart Sears's avatar Bart Sears Committed by Android (Google) Code Review
Browse files

Revert "[Settingslib] Fixed Preference background" 

Revert submission 31966577-bg-fix

Bug: b/399727309

Reason for revert: Broke the Settings app layout, see b/399727309 | [BP2A][ZP1A][All devices] Clustering in Settings has mostly gone away

Note that there is a fix forward in progress, so we will not submit this revert (unless there is a delay in getting the fix forward) but we do want to be able to cherry-pick this into the next daily build while waiting for the revert.

Reverted changes: /q/submissionid:31966577-bg-fix

Change-Id: I4c4836e163e85abb09280f6ce96db5f1c24fbc28
parent 8997f1ac

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

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

    android:color="?android:colorControlHighlight">

    <item

    <item

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

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

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

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

        android:top="2dp"

        android:bottom="16dp">

        <shape android:shape="rectangle">

        <shape android:shape="rectangle">

            <solid

            <solid

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

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

            <corners

            <corners

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

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

            <padding

                android:bottom="16dp"/>

        </shape>

        </shape>

    </item>

    </item>

</ripple>
 
</ripple>
 
 No newline at end of file

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

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

    android:color="?android:colorControlHighlight">

    <item

    <item

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

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

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

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

        android:top="2dp"

        android:bottom="16dp">

        <shape android:shape="rectangle">

        <shape android:shape="rectangle">

            <solid

            <solid

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

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

                android:bottomLeftRadius="@dimen/settingslib_preference_corner_radius"

                android:topRightRadius="4dp"

                android:topRightRadius="4dp"

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

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

            <padding

                android:bottom="16dp"/>

        </shape>

        </shape>

    </item>

    </item>

</ripple>
 
</ripple>
 
 No newline at end of file

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

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

    <item

        android:bottom="16dp"

        android:bottom="16dp"

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

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

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

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

        android:top="2dp">

        <shape

        <shape

            android:shape="rectangle"

            android:shape="rectangle"

            android:tint="?android:attr/colorAccent">

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

                android:bottomRightRadius="@dimen/settingslib_preference_corner_radius"

                android:topLeftRadius="4dp"

                android:topLeftRadius="4dp"

                android:topRightRadius="4dp" />

                android:topRightRadius="4dp" />

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

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

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

        </shape>

        </shape>

    </item>

    </item>

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

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

    android:color="?android:colorControlHighlight">

    <item

    <item

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

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

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

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

        android:top="2dp"

        android:bottom="16dp">

        <shape android:shape="rectangle">

        <shape android:shape="rectangle">

            <solid

            <solid

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

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

                android:bottomLeftRadius="@dimen/settingslib_preference_corner_radius"

                android:topRightRadius="4dp"

                android:topRightRadius="4dp"

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

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

            <padding

                android:bottom="16dp"/>

        </shape>

        </shape>

    </item>

    </item>

</ripple>
 
</ripple>
 
 No newline at end of file

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

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

    android:color="?android:colorControlHighlight">

    <item

    <item

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

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

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

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

        android:top="2dp">

        <shape android:shape="rectangle">

        <shape android:shape="rectangle">

            <solid

            <solid

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

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