From db1e3d53e30ebff5eb99d67a4a72ae117ca4a257 Mon Sep 17 00:00:00 2001 From: fbaron Date: Thu, 11 Jan 2024 10:23:47 -0800 Subject: [PATCH] Fix nested scrolling in two pane picker left pane Fix: 319151078 Test: Verify there's no nested scrolling Flag: NONE Change-Id: Ic974c85e1845f45aa0646a1ebf29696f75c9ab90 --- res/layout/widgets_two_pane_sheet_recyclerview.xml | 8 +++----- .../launcher3/widget/picker/WidgetsTwoPaneSheet.java | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/res/layout/widgets_two_pane_sheet_recyclerview.xml b/res/layout/widgets_two_pane_sheet_recyclerview.xml index c9c855c48d..8b48abbf2d 100644 --- a/res/layout/widgets_two_pane_sheet_recyclerview.xml +++ b/res/layout/widgets_two_pane_sheet_recyclerview.xml @@ -45,24 +45,22 @@ android:background="?attr/widgetPickerPrimarySurfaceColor" android:clipToPadding="false" android:elevation="0.1dp" - android:paddingBottom="8dp" + android:paddingBottom="16dp" android:paddingHorizontal="@dimen/widget_list_horizontal_margin_two_pane" launcher:layout_sticky="true"> - - + \ No newline at end of file diff --git a/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java b/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java index 54c9324096..66562373d1 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java +++ b/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java @@ -56,7 +56,7 @@ public class WidgetsTwoPaneSheet extends WidgetsFullSheet { private static final int MAXIMUM_WIDTH_LEFT_PANE_FOLDABLE_DP = 395; private static final String SUGGESTIONS_PACKAGE_NAME = "widgets_list_suggestions_entry"; - private LinearLayout mSuggestedWidgetsContainer; + private FrameLayout mSuggestedWidgetsContainer; private WidgetsListHeader mSuggestedWidgetsHeader; private LinearLayout mRightPane;