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

Commit a494c647 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use 32dp as the content margin for widgets pickers in large screen... 

Merge "Use 32dp as the content margin for widgets pickers in large screen devices" into sc-v2-dev am: 8d5cd178 am: 72e564e2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15393091

Change-Id: Ie98ba0dd07081789ade7fd34a7811e4019f12b78
parents 4eb88802 72e564e2

res/layout/add_item_confirmation_activity.xml

+8 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
            android:id="@+id/add_item_bottom_sheet_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:padding="24dp"

            android:paddingVertical="24dp"

            android:background="@drawable/add_item_dialog_background"

            android:orientation="vertical" >
@@ -46,6 +46,7 @@ 
                android:id="@+id/widget_appName"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin"

                android:gravity="center_horizontal"

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

                android:textSize="24sp"
@@ -55,8 +56,10 @@ 
                android:maxLines="1" />



            <TextView

                android:id="@+id/widget_drag_instruction"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin"

                android:gravity="center_horizontal"

                android:paddingTop="8dp"

                android:text="@string/add_item_request_drag_hint"
@@ -75,12 +78,15 @@ 
                    android:id="@+id/widget_cell"

                    layout="@layout/widget_cell"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content" />

                    android:layout_height="wrap_content"

                    android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin" />

            </ScrollView>



            <LinearLayout

                android:id="@+id/actions_container"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin"

                android:gravity="center_vertical|end"

                android:paddingVertical="8dp"

                android:orientation="horizontal">

res/layout/widgets_bottom_sheet_content.xml

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
            <include layout="@layout/widgets_table_container"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin"

                android:layout_gravity="center_horizontal" />

        </ScrollView>

    </LinearLayout>

res/layout/widgets_full_sheet.xml

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
            android:id="@+id/search_widgets_list_view"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin"

            android:visibility="gone"

            android:clipToPadding="false" />

res/layout/widgets_full_sheet_paged_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
        android:id="@+id/widgets_view_pager"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin"

        android:clipToPadding="false"

        android:paddingTop="@dimen/widget_picker_view_pager_top_padding"

        android:descendantFocusability="afterDescendants"

res/layout/widgets_full_sheet_recyclerview.xml

+1 −0
Original line number Diff line number Diff line
@@ -18,4 +18,5 @@ 
    android:id="@+id/primary_widgets_list_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin"

    android:clipToPadding="false" />
 
 No newline at end of file