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

Commit f2c6db3d authored by Jiaming Cheng's avatar Jiaming Cheng Committed by Android (Google) Code Review
Browse files

Merge "[QSDetailedView] Adjust the entry background corner radius" into main

parents 1b1a3622 fa21ea01

packages/SettingsLib/MainSwitchPreference/res/values-v31/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -34,4 +34,7 @@ 


    <!-- Radius of switch bar -->

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



    <!-- Radius of entry background -->

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

</resources>

packages/SystemUI/res/drawable/settingslib_entry_bg_off.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    <item>

        <shape android:shape="rectangle">

            <solid android:color="@androidprv:color/materialColorPrimaryContainer"/>

            <corners android:radius="@dimen/settingslib_switch_bar_radius"/>

            <corners android:radius="@dimen/settingslib_entry_bg_radius"/>

        </shape>

    </item>

</ripple>

packages/SystemUI/res/drawable/settingslib_entry_bg_off_end.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
        <shape android:shape="rectangle">

            <solid android:color="@androidprv:color/materialColorPrimaryContainer"/>

            <corners

                android:bottomLeftRadius="@dimen/settingslib_switch_bar_radius"

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

                android:bottomLeftRadius="@dimen/settingslib_entry_bg_radius"

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

        </shape>

    </item>

</ripple>

packages/SystemUI/res/drawable/settingslib_entry_bg_off_start.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
        <shape android:shape="rectangle">

            <solid android:color="@androidprv:color/materialColorPrimaryContainer"/>

            <corners

                android:topLeftRadius="@dimen/settingslib_switch_bar_radius"

                android:topRightRadius="@dimen/settingslib_switch_bar_radius"/>

                android:topLeftRadius="@dimen/settingslib_entry_bg_radius"

                android:topRightRadius="@dimen/settingslib_entry_bg_radius"/>

        </shape>

    </item>

</ripple>

packages/SystemUI/res/drawable/settingslib_entry_bg_on.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    <item>

        <shape android:shape="rectangle">

            <solid android:color="@androidprv:color/materialColorPrimary"/>

            <corners android:radius="@dimen/settingslib_switch_bar_radius"/>

            <corners android:radius="@dimen/settingslib_entry_bg_radius"/>

        </shape>

    </item>

</ripple>