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

Commit 76d91c98 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "[Homepage Revamp] adjust round corner background" into main

parents 2e23ce7d a9930e01

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

+10 −6
Original line number Diff line number Diff line
@@ -15,16 +15,20 @@ 
  limitations under the License.

  -->



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

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

    android:color="?android:colorControlHighlight">

    <item

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

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

        android:top="2dp">

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

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

        android:top="2dp"

        android:bottom="16dp">

        <shape android:shape="rectangle">

            <solid

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

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

            <corners

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

            <padding

                android:bottom="16dp"/>

        </shape>

    </item>

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

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

+10 −6
Original line number Diff line number Diff line
@@ -15,19 +15,23 @@ 
  limitations under the License.

  -->



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

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

    android:color="?android:colorControlHighlight">

    <item

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

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

        android:top="2dp">

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

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

        android:top="2dp"

        android:bottom="16dp">

        <shape android:shape="rectangle">

            <solid

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

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

            <corners

                android:topLeftRadius="4dp"

                android:bottomLeftRadius="@dimen/settingslib_preference_corner_radius"

                android:topRightRadius="4dp"

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

            <padding

                android:bottom="16dp"/>

        </shape>

    </item>

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

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

+11 −10
Original line number Diff line number Diff line
@@ -15,19 +15,20 @@ 
  limitations under the License.

  -->



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

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

    android:color="?android:colorControlHighlight">

    <item

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

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

        android:top="2dp">

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

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

        android:top="2dp"

        android:bottom="16dp">

        <shape android:shape="rectangle">

            <solid

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

                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_preference_corner_radius_selected" />

            <padding

                android:bottom="16dp"/>

        </shape>

    </item>

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

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

+6 −5
Original line number Diff line number Diff line
@@ -15,16 +15,17 @@ 
  limitations under the License.

  -->



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

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

    android:color="?android:colorControlHighlight">

    <item

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

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

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

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

        android:top="2dp">

        <shape android:shape="rectangle">

            <solid

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

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

            <corners

                android:radius="4dp" />

        </shape>

    </item>

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

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

+7 −6
Original line number Diff line number Diff line
@@ -15,16 +15,17 @@ 
  limitations under the License.

  -->



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

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

    android:color="?android:colorControlHighlight">

    <item

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

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

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

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

        android:top="2dp">

        <shape android:shape="rectangle">

            <solid

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

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

            <corners

                android:radius="4dp" />

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

        </shape>

    </item>

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