Merge "[8/n] Pin ActivityStack" into udc-qpr-dev (d73d60f4) · Commits · e / os / android_frameworks_base

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -261,10 +261,6 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
		// Updates the Split
		final TransactionRecord transactionRecord = mTransactionManager.startNewTransaction();
		final WindowContainerTransaction wct = transactionRecord.getTransaction();

		mPresenter.setTaskFragmentIsolatedNavigation(wct,
		splitPinContainer.getSecondaryContainer().getTaskFragmentToken(),
		true /* isolatedNav */);
		mPresenter.updateSplitContainer(splitPinContainer, wct);
		transactionRecord.apply(false /* shouldApplyIndependently */);
		updateCallbackIfNecessary();

+13 −0

Original line number	Diff line number	Diff line
		@@ -382,6 +382,19 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer {
		}
		setCompanionTaskFragment(wct, primaryContainer.getTaskFragmentToken(),
		secondaryContainer.getTaskFragmentToken(), splitRule, isStacked);

		// Setting isolated navigation and clear non-sticky pinned container if needed.
		final SplitPinRule splitPinRule =
		splitRule instanceof SplitPinRule ? (SplitPinRule) splitRule : null;
		if (splitPinRule == null) {
		return;
		}

		setTaskFragmentIsolatedNavigation(wct, secondaryContainer.getTaskFragmentToken(),
		!isStacked /* isolatedNav */);
		if (isStacked && !splitPinRule.isSticky()) {
		secondaryContainer.getTaskContainer().removeSplitPinContainer();
		}
		}

		/**