mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-20 11:18:21 +00:00
Previously, the margin of the recommendation table was changed to fix the bug b/209579563 , but this leaves a bug where the left/right sides of the recommendation table would be too close to the screen border. This CL should leave enough space for both sides and reveal the scroll bar again, while keeping the talkback focused on the title first once it enters the widget picker. Test: Manual Bug: 206481237 Change-Id: I808c279c3264a51b21a0bb7af8ca455d284e36ff
68 lines
3.0 KiB
XML
68 lines
3.0 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" >
|
|
<com.android.launcher3.widget.picker.WidgetsRecyclerView
|
|
android:id="@+id/primary_widgets_list_view"
|
|
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: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:layout_below="@id/collapse_handle"
|
|
android:paddingBottom="16dp"
|
|
android:paddingHorizontal="@dimen/widget_list_horizontal_margin"
|
|
android:orientation="vertical">
|
|
|
|
<TextView
|
|
android:id="@+id/title"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:gravity="center_horizontal"
|
|
android:textSize="24sp"
|
|
android:layout_marginTop="24dp"
|
|
android:textColor="?android:attr/textColorSecondary"
|
|
android:text="@string/widget_button_text"/>
|
|
|
|
<FrameLayout
|
|
android:id="@+id/search_bar_container"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:elevation="0.1dp"
|
|
android:background="?android:attr/colorBackground"
|
|
android:paddingBottom="8dp"
|
|
android:clipToPadding="false"
|
|
launcher:layout_sticky="true" >
|
|
<include layout="@layout/widgets_search_bar" />
|
|
</FrameLayout>
|
|
|
|
<com.android.launcher3.widget.picker.WidgetsRecommendationTableLayout
|
|
android:id="@+id/recommended_widget_table"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="8dp"
|
|
android:background="@drawable/widgets_recommendation_background"
|
|
android:paddingVertical="@dimen/recommended_widgets_table_vertical_padding"
|
|
android:visibility="gone" />
|
|
</com.android.launcher3.views.StickyHeaderLayout>
|
|
|
|
</merge> |