commit a54535b8f59bc1edaaa9061bc70c424f2c601701
author Steven Ng <stevenckng@google.com> Fri Jul 30 14:12:00 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 30 14:12:00 2021 +0000
tree 42cf5515f1701147978120d0b1545ba123106ef7
parent 9e08d559a4ba30658cda68315cb668977fa3c5ca
parent 3edfa98ba7be61e17ab896ad53ecaf4204efd873

Merge "Use the right content to estimate the span in WidgetsFullSheet" into sc-v2-dev

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;