commit 5ac5d7143daaef499b46acd2030092465bc6add1
author arangelov <arangelov@google.com> Wed Mar 18 20:24:03 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Mar 20 01:32:51 2020 +0000
tree fa058c9e288ad207fafaf36db91965af43116ac3
parent 3918e421dcafd4a46931d429a1d0bdcdedd49ab6

Call setAdapter from handleLayoutChanged.

Test: manual
Fixes: 150918223
Fixes: 150922090
Fixes: 151329221
Fixes: 151077241
Change-Id: I723634840cfdc40eb307f2ce4e170178692f12f3
(cherry picked from commit 2731fa71fe68b862f476eac6c93f9503c695706b)

core/java/com/android/internal/app/ChooserActivity.java

diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 78a0ae0..a1a434d 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -2418,13 +2418,20 @@
         if (isLayoutUpdated
                 || mLastNumberOfChildren != recyclerView.getChildCount()) {
             mCurrAvailableWidth = availableWidth;
-            if (isLayoutUpdated
-                    && mChooserMultiProfilePagerAdapter.getCurrentUserHandle() != getUser()) {
-                // This fixes b/150936654 - empty work tab in share sheet when swiping
-                mChooserMultiProfilePagerAdapter.getActiveAdapterView()
-                        .setAdapter(mChooserMultiProfilePagerAdapter.getCurrentRootAdapter());
+            if (isLayoutUpdated) {
+                // It is very important we call setAdapter from here. Otherwise in some cases
+                // the resolver list doesn't get populated, such as b/150922090, b/150918223
+                // and b/150936654
+                recyclerView.setAdapter(gridAdapter);
+                ((GridLayoutManager) recyclerView.getLayoutManager()).setSpanCount(
+                        gridAdapter.getMaxTargetsPerRow());
+            }
+
+            if (mChooserMultiProfilePagerAdapter.getCurrentUserHandle() != getUser()) {
                 return;
-            } else if (mChooserMultiProfilePagerAdapter.getCurrentUserHandle() != getUser()) {
+            }
+
+            if (mLastNumberOfChildren == recyclerView.getChildCount()) {
                 return;
             }