Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 637f9681 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "[8/n] Pin ActivityStack" into udc-qpr-dev am: d73d60f4 am: 8123930f 

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



Change-Id: If6f50a655f19ebc70c4d10245c7329662ed2cff9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 95f2316d 8123930f

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();

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

+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();

        }

    }



    /**