commit 3edfa98ba7be61e17ab896ad53ecaf4204efd873
author Steven Ng <stevenckng@google.com> Fri Jul 30 13:15:26 2021 +0100
committer Steven Ng <stevenckng@google.com> Fri Jul 30 13:15:26 2021 +0100
tree dcf2f90ae192cbb0cef2eaa4b28680d242eb9fc4
parent 02d45252f3f05cc2b9c92411357d857af372b8fe

Use the right content to estimate the span in WidgetsFullSheet

Test: Manual
Fix: 194784402
Change-Id: I150f4c7b5a0344caa2bea3f1502894cb0f32e208

src/com/android/launcher3/widget/picker/WidgetsFullSheet.java

diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index e36ea90..be83f9a 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -402,7 +402,10 @@
     private boolean updateMaxSpansPerRow() {
         if (getMeasuredWidth() == 0) return false;
 
-        int maxHorizontalSpans = computeMaxHorizontalSpans(mContent,
+        View content = mHasWorkProfile
+                ? mViewPager
+                : mAdapters.get(AdapterHolder.PRIMARY).mWidgetsRecyclerView;
+        int maxHorizontalSpans = computeMaxHorizontalSpans(content,
                 mWidgetSheetContentHorizontalPadding);
         if (mMaxSpansPerRow != maxHorizontalSpans) {
             mMaxSpansPerRow = maxHorizontalSpans;