Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Call setAdapter from handleLayoutChanged." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-19 12:59:42 +00:00
committed by Android (Google) Code Review
parent a895040b48 2731fa71fe
commit bfdf19c46d
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -2418,13 +2418,20 @@ public class ChooserActivity extends ResolverActivity implements
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;
}