commit 3a75b494f2e94c4e893bd6e1748e7c03a6f96cc7
author Sunny Goyal <sunnygoyal@google.com> Sat May 06 09:43:06 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 06 09:43:06 2023 +0000
tree a02e1192eeb177bd91f6ecc69df33c9f3d6917fb
parent 698f59ccbbdcb1728c795cf0c68978c022a73f76
parent e7da062d9ad12f05032077ee2b00d4469776f18b

Merge "Fixing WidgetBottomSheet getting cut off around insets" into udc-dev

res/layout/widgets_bottom_sheet_content.xml

diff --git a/res/layout/widgets_bottom_sheet_content.xml b/res/layout/widgets_bottom_sheet_content.xml
index b76eef7..065c2ed 100644
--- a/res/layout/widgets_bottom_sheet_content.xml
+++ b/res/layout/widgets_bottom_sheet_content.xml
@@ -42,7 +42,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fadeScrollbars="false"
-            android:layout_marginVertical="16dp">
+            android:layout_marginTop="16dp">
             <include layout="@layout/widgets_table_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

src/com/android/launcher3/widget/WidgetsBottomSheet.java

diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index 23cdae9..846dafd 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -252,8 +252,11 @@
         super.setInsets(insets);
         int bottomPadding = Math.max(insets.bottom, mNavBarScrimHeight);
 
-        mContent.setPadding(mContent.getPaddingStart(),
-                mContent.getPaddingTop(), mContent.getPaddingEnd(),
+        View widgetsTable = findViewById(R.id.widgets_table);
+        widgetsTable.setPadding(
+                widgetsTable.getPaddingLeft(),
+                widgetsTable.getPaddingTop(),
+                widgetsTable.getPaddingRight(),
                 bottomPadding);
         if (bottomPadding > 0) {
             setupNavBarColor();