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

Commit 868918c4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update extensions to rename isDefaultMinSizeSatisfied" into tm-qpr-dev am: c5978eaf 

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



Change-Id: I92d6cedb490ae7c6b4674f3a96f194ce65af100e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e39bf513 c5978eaf

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

+3 −3
Original line number Diff line number Diff line
@@ -555,9 +555,9 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { 
        final Function<SplitAttributesCalculatorParams, SplitAttributes> calculator =

                mController.getSplitAttributesCalculator();

        final SplitAttributes defaultSplitAttributes = rule.getDefaultSplitAttributes();

        final boolean isDefaultMinSizeSatisfied = rule.checkParentMetrics(taskWindowMetrics);

        final boolean areDefaultConstraintsSatisfied = rule.checkParentMetrics(taskWindowMetrics);

        if (calculator == null) {

            if (!isDefaultMinSizeSatisfied) {

            if (!areDefaultConstraintsSatisfied) {

                return EXPAND_CONTAINERS_ATTRIBUTES;

            }

            return sanitizeSplitAttributes(taskProperties, defaultSplitAttributes,
@@ -568,7 +568,7 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { 
                        taskConfiguration.windowConfiguration);

        final SplitAttributesCalculatorParams params = new SplitAttributesCalculatorParams(

                taskWindowMetrics, taskConfiguration, windowLayoutInfo, defaultSplitAttributes,

                isDefaultMinSizeSatisfied, rule.getTag());

                areDefaultConstraintsSatisfied, rule.getTag());

        final SplitAttributes splitAttributes = calculator.apply(params);

        return sanitizeSplitAttributes(taskProperties, splitAttributes, minDimensionsPair);

    }