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

2021-07-30 14:12:00 +00:00
parent 9e08d559a4 3edfa98ba7
commit a54535b8f5
1 changed files with 4 additions and 1 deletions
@@ -402,7 +402,10 @@ public class WidgetsFullSheet extends BaseWidgetSheet
    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;