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

Commit 7a12f220 authored by Edgar Wang's avatar Edgar Wang
Browse files

Update preference round corner background 

Bug: 340510477
Test: visual
Change-Id: I38e1d17641497c89ebb1fe6d11e26d146d5db4fa
parent 4250dc6f

packages/SettingsLib/SettingsTheme/res/color-v35/settingslib_preference_bg_color.xml

+4 −4
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
-->



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

    <item android:state_pressed="true" android:color="@color/settingslib_materialColorSecondaryContainer"/>

    <item android:state_selected="true" android:color="@color/settingslib_materialColorSecondaryContainer"/>

    <item android:state_activated="true" android:color="@color/settingslib_materialColorSecondaryContainer"/>

    <item android:color="@color/settingslib_materialColorSurfaceContainerHighest"/> <!-- not selected -->

    <item android:state_pressed="true" android:color="@color/settingslib_materialColorSurfaceContainerHigh"/>

    <item android:state_selected="true" android:color="@color/settingslib_materialColorSurfaceContainerHigh"/>

    <item android:state_activated="true" android:color="@color/settingslib_materialColorSurfaceContainerHigh"/>

    <item android:color="@color/settingslib_materialColorSurfaceBright"/> <!-- not selected -->

</selector>
 
 No newline at end of file

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

+2 −2
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ 
    <item

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

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

        android:top="1dp">

        android:top="2dp">

        <shape android:shape="rectangle">

            <solid

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

            <corners

                android:radius="?android:attr/dialogCornerRadius" />

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

        </shape>

    </item>

</layer-list>
 
 No newline at end of file

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

+5 −5
Original line number Diff line number Diff line
@@ -19,15 +19,15 @@ 
    <item

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

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

        android:top="1dp">

        android:top="2dp">

        <shape android:shape="rectangle">

            <solid

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

            <corners

                android:topLeftRadius="0dp"

                android:bottomLeftRadius="?android:attr/dialogCornerRadius"

                android:topRightRadius="0dp"

                android:bottomRightRadius="?android:attr/dialogCornerRadius" />

                android:topLeftRadius="4dp"

                android:bottomLeftRadius="@dimen/settingslib_preference_corner_radius"

                android:topRightRadius="4dp"

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

        </shape>

    </item>

</layer-list>
 
 No newline at end of file

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

0 → 100644
+33 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2024 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

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

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

        android:top="2dp">

        <shape android:shape="rectangle">

            <solid

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

            <corners

                android:topLeftRadius="4dp"

                android:bottomLeftRadius="@dimen/settingslib_preference_corner_radius"

                android:topRightRadius="4dp"

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

        </shape>

    </item>

</layer-list>
 
 No newline at end of file

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

+2 −2
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ 
    <item

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

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

        android:top="1dp">

        android:top="2dp">

        <shape android:shape="rectangle">

            <solid

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

            <corners

                android:radius="1dp" />

                android:radius="4dp" />

        </shape>

    </item>

</layer-list>
 
 No newline at end of file