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

Commit 55fed64c authored by fbaron's avatar fbaron
Browse files

Rename widgets two pane sheet layout files and spec files to more fitting name 

Currently the names used for widgets two pane sheet files are similar to full sheet files, just with "_large_screen" added to it. This is not a good name as it can cause confusion. The new name includes "_two_pane" which is more indicative of the actual functionality of these files.

Fix: 276917926
Test: verify widget picker two pane still works
Change-Id: I23cf2a20fc137cc3e99c5fdc90100648a0926368
parent 9529f08b

res/layout/widgets_list_row_header_two_pane.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    android:focusable="true"

    launcher:appIconSize="48dp"

    android:descendantFocusability="afterDescendants"

    android:background="@drawable/bg_widgets_header_large_screen" >

    android:background="@drawable/bg_widgets_header_two_pane" >



    <ImageView

        android:id="@+id/app_icon"

res/layout/widgets_full_sheet_large_screen.xml→res/layout/widgets_two_pane_sheet.xml

+5 −5
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
            android:layout_marginTop="24dp"

            android:gravity="center_horizontal"

            android:layout_below="@id/collapse_handle"

            android:paddingHorizontal="@dimen/widget_list_horizontal_margin_large_screen"

            android:paddingHorizontal="@dimen/widget_list_horizontal_margin_two_pane"

            android:text="@string/widget_button_text"

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

            android:textSize="24sp" />
@@ -76,7 +76,7 @@ 
                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:clipToPadding="false"

                    android:paddingHorizontal="@dimen/widget_list_horizontal_margin_large_screen"

                    android:paddingHorizontal="@dimen/widget_list_horizontal_margin_two_pane"

                    android:visibility="gone" />

            </FrameLayout>
@@ -85,8 +85,8 @@ 
                android:layout_width="0dp"

                android:layout_height="match_parent"

                android:layout_weight="0.67"

                android:layout_marginEnd="@dimen/widget_list_horizontal_margin_large_screen"

                android:paddingTop="@dimen/widget_list_horizontal_margin_large_screen"

                android:layout_marginEnd="@dimen/widget_list_horizontal_margin_two_pane"

                android:paddingTop="@dimen/widget_list_horizontal_margin_two_pane"

                android:gravity="end"

                android:layout_gravity="end"

                android:orientation="horizontal">
@@ -118,7 +118,7 @@ 
                            android:layout_width="match_parent"

                            android:layout_height="wrap_content"

                            android:paddingHorizontal=

                                "@dimen/widget_list_horizontal_margin_large_screen"

                                "@dimen/widget_list_horizontal_margin_two_pane"

                            android:visibility="gone" />

                    </LinearLayout>

                </ScrollView>

res/layout/widgets_full_sheet_paged_view_large_screen.xml→res/layout/widgets_two_pane_sheet_paged_view.xml

+5 −5
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto">



    <FrameLayout

        android:id="@+id/widgets_full_sheet_paged_view_large_screen"

        android:id="@+id/widgets_two_pane_sheet_paged_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:gravity="start"
@@ -29,7 +29,7 @@ 
            android:layout_height="match_parent"

            android:clipToPadding="false"

            android:descendantFocusability="afterDescendants"

            android:paddingHorizontal="@dimen/widget_list_horizontal_margin_large_screen"

            android:paddingHorizontal="@dimen/widget_list_horizontal_margin_two_pane"

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



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

                android:elevation="0.1dp"

                android:paddingBottom="8dp"

                android:paddingHorizontal="@dimen/widget_list_horizontal_margin_large_screen"

                android:paddingHorizontal="@dimen/widget_list_horizontal_margin_two_pane"

                launcher:layout_sticky="true">



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

                android:id="@+id/suggestions_header"

                android:layout_marginTop="8dp"

                android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin_large_screen"

                android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin_two_pane"

                android:orientation="horizontal">

            </LinearLayout>
@@ -84,7 +84,7 @@ 
                android:gravity="center_horizontal"

                android:orientation="horizontal"

                android:paddingVertical="8dp"

                android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin_large_screen"

                android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin_two_pane"

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

                style="@style/TextHeadline"

                launcher:layout_sticky="true">

res/layout/widgets_full_sheet_recyclerview_large_screen.xml→res/layout/widgets_two_pane_sheet_recyclerview.xml

+4 −4
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto">



    <FrameLayout

        android:id="@+id/widgets_full_sheet_recyclerview_large_screen"

        android:id="@+id/widgets_two_pane_sheet_recyclerview"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:gravity="start"
@@ -28,7 +28,7 @@ 
            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_large_screen"

            android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin_two_pane"

            android:clipToPadding="false" />



        <!-- SearchAndRecommendationsView without the tab layout as well -->
@@ -47,7 +47,7 @@ 
                android:clipToPadding="false"

                android:elevation="0.1dp"

                android:paddingBottom="8dp"

                android:paddingHorizontal="@dimen/widget_list_horizontal_margin_large_screen"

                android:paddingHorizontal="@dimen/widget_list_horizontal_margin_two_pane"

                launcher:layout_sticky="true">



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

                android:id="@+id/suggestions_header"

                android:layout_marginTop="8dp"

                android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin_large_screen"

                android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin_two_pane"

                android:orientation="horizontal">

            </LinearLayout>

        </com.android.launcher3.views.StickyHeaderLayout>