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

Merge "Reset adjacent TaskFragments while updating split container" into sc-v2-dev am: c8730d3600

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15937029

Change-Id: I3d57f3f3d7fc30182a0ff3bf42af031c3c703d5f
This commit is contained in:
Louis Chang
2021-10-05 13:24:12 +00:00
committed by Automerger Merge Worker
parent 14d76894c5 c8730d3600
commit 0371ae0343
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java
View File

@@ -252,7 +252,8 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer {
// Getting the parent bounds using the updated container - it will have the recent value.
final Rect parentBounds = getParentContainerBounds(updatedContainer);
final SplitRule rule = splitContainer.getSplitRule();
final Activity activity = splitContainer.getPrimaryContainer().getTopNonFinishingActivity();
final TaskFragmentContainer primaryContainer = splitContainer.getPrimaryContainer();
final Activity activity = primaryContainer.getTopNonFinishingActivity();
if (activity == null) {
return;
}
@@ -264,10 +265,12 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer {
// If the task fragments are not registered yet, the positions will be updated after they
// are created again.
resizeTaskFragmentIfRegistered(wct, splitContainer.getPrimaryContainer(),
primaryRectBounds);
resizeTaskFragmentIfRegistered(wct, splitContainer.getSecondaryContainer(),
secondaryRectBounds);
resizeTaskFragmentIfRegistered(wct, primaryContainer, primaryRectBounds);
final TaskFragmentContainer secondaryContainer = splitContainer.getSecondaryContainer();
resizeTaskFragmentIfRegistered(wct, secondaryContainer, secondaryRectBounds);
setAdjacentTaskFragments(wct, primaryContainer.getTaskFragmentToken(),
secondaryContainer.getTaskFragmentToken(), rule);
}
/**