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

Merge "Call setAdapter from handleLayoutChange for the other profile" into rvc-dev am: 5527ace031

Browse Source 
Change-Id: Icc818b9e7c18ed6f9d6561382162c6604c50040e
This commit is contained in:
Automerger Merge Worker
2020-03-11 15:41:52 +00:00
parent 2268e82234 5527ace031
commit 7eabb04fb9
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2398,17 +2398,20 @@ public class ChooserActivity extends ResolverActivity implements
} }
final int availableWidth = right - left - v.getPaddingLeft() - v.getPaddingRight(); final int availableWidth = right - left - v.getPaddingLeft() - v.getPaddingRight();
if (mChooserMultiProfilePagerAdapter.getCurrentUserHandle() != getUser()) { boolean isLayoutUpdated = gridAdapter.consumeLayoutRequest()
gridAdapter.calculateChooserTargetWidth(availableWidth);
return;
}
if (gridAdapter.consumeLayoutRequest()
|| gridAdapter.calculateChooserTargetWidth(availableWidth) || gridAdapter.calculateChooserTargetWidth(availableWidth)
|| recyclerView.getAdapter() == null || recyclerView.getAdapter() == null
|| mLastNumberOfChildren != recyclerView.getChildCount() || availableWidth != mCurrAvailableWidth;
|| availableWidth != mCurrAvailableWidth) { if (isLayoutUpdated
|| mLastNumberOfChildren != recyclerView.getChildCount()) {
mCurrAvailableWidth = availableWidth; mCurrAvailableWidth = availableWidth;
if (isLayoutUpdated
&& mChooserMultiProfilePagerAdapter.getCurrentUserHandle() != getUser()) {
// This fixes b/150936654 - empty work tab in share sheet when swiping
mChooserMultiProfilePagerAdapter.getActiveAdapterView()
.setAdapter(mChooserMultiProfilePagerAdapter.getCurrentRootAdapter());
return;
}
getMainThreadHandler().post(() -> { getMainThreadHandler().post(() -> {
if (mResolverDrawerLayout == null || gridAdapter == null) { if (mResolverDrawerLayout == null || gridAdapter == null) {