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

Commit 079a4029 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Expressive design] Update the background corner radius" into main

parents e751a8c9 4137b757

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

+1 −4
Original line number Diff line number Diff line
@@ -26,10 +26,7 @@ 
            <solid

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

            <corners

                android:topLeftRadius="4dp"

                android:bottomLeftRadius="@dimen/settingslib_preference_corner_radius"

                android:topRightRadius="4dp"

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

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

            <padding

                android:bottom="16dp"/>

        </shape>

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

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
            <solid

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

            <corners

                android:radius="4dp" />

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

        </shape>

    </item>

</ripple>
 
 No newline at end of file

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
            <solid

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

            <corners

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

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

            <padding

                android:bottom="16dp"/>

        </shape>

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

+1 −4
Original line number Diff line number Diff line
@@ -25,10 +25,7 @@ 
            <solid

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

            <corners

                android:topLeftRadius="@dimen/settingslib_preference_corner_radius"

                android:bottomLeftRadius="4dp"

                android:topRightRadius="@dimen/settingslib_preference_corner_radius"

                android:bottomRightRadius="4dp" />

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

        </shape>

    </item>

</ripple>
 
 No newline at end of file

packages/SettingsLib/SettingsTheme/res/values-v36/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -17,5 +17,4 @@ 


<resources>

    <dimen name="settingslib_preference_corner_radius">20dp</dimen>

    <dimen name="settingslib_preference_corner_radius_selected">28dp</dimen>

</resources>
 
 No newline at end of file