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

Merge "Merge "Call setAdapter from handleLayoutChange for the other profile" into rvc-dev am: 5527ace031 am: 7eabb04fb9" into rvc-d1-dev-plus-aosp am: 967a7243f3

Browse Source 
Change-Id: Ic52086a7cbd8bb54302eb8626cea92a21a833591
This commit is contained in:
Automerger Merge Worker
2020-03-11 16:17:55 +00:00
parent 98de60ad39 967a7243f3
commit 93914af9e2
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();
if (mChooserMultiProfilePagerAdapter.getCurrentUserHandle() != getUser()) {
gridAdapter.calculateChooserTargetWidth(availableWidth);
return;
}
if (gridAdapter.consumeLayoutRequest()
boolean isLayoutUpdated = gridAdapter.consumeLayoutRequest()
|| gridAdapter.calculateChooserTargetWidth(availableWidth)
|| recyclerView.getAdapter() == null
|| mLastNumberOfChildren != recyclerView.getChildCount()
|| availableWidth != mCurrAvailableWidth) {
|| availableWidth != mCurrAvailableWidth;
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());
return;
}
getMainThreadHandler().post(() -> {
if (mResolverDrawerLayout == null || gridAdapter == null) {