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

Commit 8fd957e3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix margins/padding in widget picker" into tm-qpr-dev

parents 3dd14405 79572f6a

res/layout/widgets_full_sheet_paged_view.xml

+3 −5
Original line number Diff line number Diff line
@@ -23,19 +23,20 @@ 
        android:clipToPadding="false"

        android:layout_below="@id/collapse_handle"

        android:descendantFocusability="afterDescendants"

        android:paddingHorizontal="@dimen/widget_list_horizontal_margin"

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



        <com.android.launcher3.widget.picker.WidgetsRecyclerView

            android:id="@+id/primary_widgets_list_view"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:paddingHorizontal="@dimen/widget_list_horizontal_margin"

            android:clipToPadding="false" />



        <com.android.launcher3.widget.picker.WidgetsRecyclerView

            android:id="@+id/work_widgets_list_view"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:paddingHorizontal="@dimen/widget_list_horizontal_margin"

            android:clipToPadding="false" />



    </com.android.launcher3.widget.picker.WidgetPagedView>
@@ -47,6 +48,7 @@ 
        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">
@@ -57,7 +59,6 @@ 
            android:gravity="center_horizontal"

            android:textSize="24sp"

            android:layout_marginTop="24dp"

            android:paddingHorizontal="@dimen/widget_list_horizontal_margin"

            android:textColor="?android:attr/textColorSecondary"

            android:text="@string/widget_button_text"/>
@@ -68,7 +69,6 @@ 
            android:elevation="0.1dp"

            android:background="?android:attr/colorBackground"

            android:paddingBottom="8dp"

            android:paddingHorizontal="@dimen/widget_list_horizontal_margin"

            launcher:layout_sticky="true">

            <include layout="@layout/widgets_search_bar" />

        </FrameLayout>
@@ -80,7 +80,6 @@ 
            android:layout_marginTop="8dp"

            android:background="@drawable/widgets_surface_background"

            android:paddingVertical="@dimen/recommended_widgets_table_vertical_padding"

            android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin"

            android:visibility="gone" />



        <com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip
@@ -90,7 +89,6 @@ 
            android:gravity="center_horizontal"

            android:orientation="horizontal"

            android:paddingVertical="8dp"

            android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin"

            android:background="?android:attr/colorBackground"

            style="@style/TextHeadline"

            launcher:layout_sticky="true">

res/layout/widgets_full_sheet_recyclerview.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
        android:layout_below="@id/collapse_handle"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin"

        android:paddingHorizontal="@dimen/widget_list_horizontal_margin"

        android:clipToPadding="false" />



    <!-- SearchAndRecommendationsView without the tab layout as well -->
@@ -30,7 +30,7 @@ 
        android:layout_height="wrap_content"

        android:layout_below="@id/collapse_handle"

        android:paddingBottom="16dp"

        android:paddingHorizontal="@dimen/widget_list_horizontal_margin"

        android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin"

        android:clipToOutline="true"

        android:orientation="vertical">