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

Commit d93feeba authored by Stevie Kideckel's avatar Stevie Kideckel
Browse files

Fix corner radius for expanded widget picker list items 

Also create the drawables at runtime to avoid all the permutations

Fix: 189329394
Test: verified locally
Change-Id: I0497759ff68bd4ae6b1635423cfd4713f06d349f
parent f1521459

res/drawable/widgets_list_bottom_ripple.xml

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

<!--

/*

**

** Copyright 2021, 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.

*/

-->

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

    android:color="?android:attr/colorControlHighlight">

    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

            <solid android:color="@color/surface" />

            <corners

                android:topLeftRadius="@dimen/widget_list_content_corner_radius"

                android:topRightRadius="@dimen/widget_list_content_corner_radius"

                android:bottomLeftRadius="@dimen/widget_list_top_bottom_corner_radius"

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

        </shape>

    </item>

    <item android:id="@android:id/background">

        <shape android:shape="rectangle">

            <solid android:color="@color/surface" />

            <corners

                android:topLeftRadius="@dimen/widget_list_content_corner_radius"

                android:topRightRadius="@dimen/widget_list_content_corner_radius"

                android:bottomLeftRadius="@dimen/widget_list_top_bottom_corner_radius"

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

        </shape>

    </item>

</ripple>
 
 No newline at end of file

res/drawable/widgets_list_middle_ripple.xml

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

<!--

/*

**

** Copyright 2021, 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.

*/

-->

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

    android:color="?android:attr/colorControlHighlight">

    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

            <solid android:color="@color/surface" />

            <corners

                android:topLeftRadius="@dimen/widget_list_content_corner_radius"

                android:topRightRadius="@dimen/widget_list_content_corner_radius"

                android:bottomLeftRadius="@dimen/widget_list_content_corner_radius"

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

        </shape>

    </item>



    <item android:id="@android:id/background">

        <shape android:shape="rectangle">

            <solid android:color="@color/surface" />

            <corners

                android:topLeftRadius="@dimen/widget_list_content_corner_radius"

                android:topRightRadius="@dimen/widget_list_content_corner_radius"

                android:bottomLeftRadius="@dimen/widget_list_content_corner_radius"

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

        </shape>

    </item>

</ripple>
 
 No newline at end of file

res/drawable/widgets_list_single_item_ripple.xml

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

<!--

/*

**

** Copyright 2021, 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.

*/

-->

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

    android:color="?android:attr/colorControlHighlight">

    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

            <solid android:color="@color/surface" />

            <corners

                android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"

                android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"

                android:bottomLeftRadius="@dimen/widget_list_top_bottom_corner_radius"

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

        </shape>

    </item>

    <item android:id="@android:id/background">

        <shape android:shape="rectangle">

            <solid android:color="@color/surface" />

            <corners

                android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"

                android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"

                android:bottomLeftRadius="@dimen/widget_list_top_bottom_corner_radius"

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

        </shape>

    </item>

</ripple>
 
 No newline at end of file

res/drawable/widgets_list_top_ripple.xml

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

<!--

/*

**

** Copyright 2021, 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.

*/

-->

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

    android:color="?android:attr/colorControlHighlight">

    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

            <solid android:color="@color/surface" />

            <corners

                android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"

                android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"

                android:bottomLeftRadius="@dimen/widget_list_content_corner_radius"

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

        </shape>

    </item>



    <item android:id="@android:id/background">

        <shape android:shape="rectangle">

            <solid android:color="@color/surface" />

            <corners

                android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"

                android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"

                android:bottomLeftRadius="@dimen/widget_list_content_corner_radius"

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

        </shape>

    </item>

</ripple>
 
 No newline at end of file

res/layout/widgets_list_row_header.xml

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginHorizontal="16dp"

    android:background="@drawable/widgets_list_middle_ripple"

    android:layout_marginBottom="@dimen/widget_list_entry_bottom_margin"

    android:paddingVertical="@dimen/widget_list_header_view_vertical_padding"

    android:orientation="horizontal"