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

Commit c54a8c3c authored by fbaron's avatar fbaron
Browse files

Fix switching between work and personal profile in widget picker not clipping recyclerview 

Fix: 283139508
Test: Verify swiping between work and personal profile clips the recyclerview properly
Flag: no flag
Change-Id: I7f4ccd6981f91a5ccb9705eca67823c8c81c262f
parent 258019fe

res/layout/widgets_full_sheet.xml

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
        <com.android.launcher3.views.RecyclerViewFastScroller

            android:id="@+id/fast_scroller"

            android:layout_width="@dimen/fastscroll_width"

            android:elevation="1dp"

            android:layout_height="match_parent"

            android:layout_alignParentEnd="true"

            android:layout_alignParentTop="true"

res/layout/widgets_full_sheet_paged_view.xml

+3 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 
        android:layout_height="wrap_content"

        android:layout_below="@id/collapse_handle"

        android:paddingBottom="0dp"

        android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin"

        android:clipToOutline="true"

        android:orientation="vertical">
@@ -67,6 +66,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:elevation="0.1dp"

            android:paddingHorizontal="@dimen/widget_list_horizontal_margin"

            android:background="?attr/widgetPickerPrimarySurfaceColor"

            android:paddingBottom="8dp"

            launcher:layout_sticky="true">
@@ -78,6 +78,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="8dp"

            android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin"

            android:background="@drawable/widgets_surface_background"

            android:paddingVertical="@dimen/recommended_widgets_table_vertical_padding"

            android:visibility="gone" />
@@ -89,6 +90,7 @@ 
            android:gravity="center_horizontal"

            android:orientation="horizontal"

            android:paddingVertical="8dp"

            android:paddingHorizontal="@dimen/widget_list_horizontal_margin"

            android:background="?attr/widgetPickerPrimarySurfaceColor"

            style="@style/TextHeadline"

            launcher:layout_sticky="true">

res/layout/widgets_two_pane_sheet_paged_view.xml

+2 −6
Original line number Diff line number Diff line
@@ -13,14 +13,14 @@ 
     limitations under the License.

-->

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

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    xmlns:app="http://schemas.android.com/apk/res-auto">

    xmlns:launcher="http://schemas.android.com/apk/res-auto">



    <FrameLayout

        android:id="@+id/widgets_two_pane_sheet_paged_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:gravity="start"

        android:paddingHorizontal="@dimen/widget_list_horizontal_margin_two_pane"

        android:layout_gravity="start"

        android:layout_alignParentStart="true">

        <com.android.launcher3.widget.picker.WidgetPagedView
@@ -29,7 +29,6 @@ 
            android:layout_height="match_parent"

            android:clipToPadding="false"

            android:descendantFocusability="afterDescendants"

            android:paddingHorizontal="@dimen/widget_list_horizontal_margin_two_pane"

            launcher:pageIndicator="@+id/tabs" >



            <com.android.launcher3.widget.picker.WidgetsRecyclerView
@@ -62,7 +61,6 @@ 
                android:clipToPadding="false"

                android:elevation="0.1dp"

                android:paddingBottom="8dp"

                android:paddingHorizontal="@dimen/widget_list_horizontal_margin_two_pane"

                launcher:layout_sticky="true">



                <include layout="@layout/widgets_search_bar" />
@@ -73,7 +71,6 @@ 
                android:layout_height="match_parent"

                android:id="@+id/suggestions_header"

                android:layout_marginTop="8dp"

                android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin_two_pane"

                android:orientation="horizontal"

                android:background="?attr/widgetPickerPrimarySurfaceColor"

                launcher:layout_sticky="true">
@@ -86,7 +83,6 @@ 
                android:gravity="center_horizontal"

                android:orientation="horizontal"

                android:paddingVertical="8dp"

                android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin_two_pane"

                android:background="?attr/widgetPickerPrimarySurfaceColor"

                style="@style/TextHeadline"

                launcher:layout_sticky="true">

res/layout/widgets_two_pane_sheet_recyclerview.xml

+1 −2
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ 
     limitations under the License.

-->

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

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    xmlns:app="http://schemas.android.com/apk/res-auto">

    xmlns:launcher="http://schemas.android.com/apk/res-auto">



    <FrameLayout

        android:id="@+id/widgets_two_pane_sheet_recyclerview"