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

Browse Source
This commit is contained in:
Louis Chang
2021-10-05 13:12:45 +00:00
committed by Android (Google) Code Review
parent e1aec89167 8e0d7c8616
commit c8730d3600
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. // Getting the parent bounds using the updated container - it will have the recent value.
final Rect parentBounds = getParentContainerBounds(updatedContainer); final Rect parentBounds = getParentContainerBounds(updatedContainer);
final SplitRule rule = splitContainer.getSplitRule(); final SplitRule rule = splitContainer.getSplitRule();
final Activity activity = splitContainer.getPrimaryContainer().getTopNonFinishingActivity(); final TaskFragmentContainer primaryContainer = splitContainer.getPrimaryContainer();
final Activity activity = primaryContainer.getTopNonFinishingActivity();
if (activity == null) { if (activity == null) {
return; return;
} }
@@ -264,10 +265,12 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer {
// If the task fragments are not registered yet, the positions will be updated after they // If the task fragments are not registered yet, the positions will be updated after they
// are created again. // are created again.
resizeTaskFragmentIfRegistered(wct, splitContainer.getPrimaryContainer(), resizeTaskFragmentIfRegistered(wct, primaryContainer, primaryRectBounds);
primaryRectBounds); final TaskFragmentContainer secondaryContainer = splitContainer.getSecondaryContainer();
resizeTaskFragmentIfRegistered(wct, splitContainer.getSecondaryContainer(), resizeTaskFragmentIfRegistered(wct, secondaryContainer, secondaryRectBounds);
secondaryRectBounds);
setAdjacentTaskFragments(wct, primaryContainer.getTaskFragmentToken(),
secondaryContainer.getTaskFragmentToken(), rule);
} }
/** /**