Federico Baron
c3ab820144
When we added widget picker two pane layout, it broke some tests with the flag on. Here we fix those tests. Bug: 256684299 Test: AddWidgetsTest and TaplTestsLauncher3#testWidget Change-Id: I383c754016d82fba51fa0b7b0459cd7e83b274d8
66 lines
2.9 KiB
XML
66 lines
2.9 KiB
XML
<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 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.
|
|
-->
|
|
<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">
|
|
|
|
<FrameLayout
|
|
android:id="@+id/widgets_full_sheet_recyclerview_large_screen"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:gravity="start"
|
|
android:layout_gravity="start"
|
|
android:layout_alignParentStart="true">
|
|
|
|
<com.android.launcher3.widget.picker.WidgetsRecyclerView
|
|
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:clipToPadding="false" />
|
|
|
|
<!-- SearchAndRecommendationsView without the tab layout as well -->
|
|
<com.android.launcher3.views.StickyHeaderLayout
|
|
android:id="@+id/search_and_recommendations_container"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:clipToOutline="true"
|
|
android:orientation="vertical">
|
|
|
|
<FrameLayout
|
|
android:id="@+id/search_bar_container"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:background="?android:attr/colorBackground"
|
|
android:clipToPadding="false"
|
|
android:elevation="0.1dp"
|
|
android:paddingBottom="8dp"
|
|
android:paddingHorizontal="@dimen/widget_list_horizontal_margin_large_screen"
|
|
launcher:layout_sticky="true">
|
|
|
|
<include layout="@layout/widgets_search_bar" />
|
|
</FrameLayout>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
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:orientation="horizontal">
|
|
</LinearLayout>
|
|
</com.android.launcher3.views.StickyHeaderLayout>
|
|
</FrameLayout>
|
|
</merge> |