| commit | 73b4a844b684b4df16f31f16e610b675cdcb7ca8 | [log] [tgz] |
|---|---|---|
| author | Steven Ng <stevenckng@google.com> | Fri Jul 30 14:47:54 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 30 14:47:54 2021 +0000 |
| tree | 83f52a2d2963b671effba2433b0d1bc1644bb9a8 | |
| parent | 2f02ee739a6a17b3f1b78b30744e94d9421e0644 [diff] | |
| parent | fc52326c13975dab686dd1b2f08654105cc1bec6 [diff] |
Merge "Use the right content to estimate the span in WidgetsFullSheet" into sc-v2-dev am: a54535b8f5 am: fc52326c13 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15430778 Change-Id: Ieef1015abf9d926996c73f14e1a8e4a53c11efa2
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;