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

Commit 2462720c authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Update extensions to rename isDefaultMinSizeSatisfied"

parents 3ca19a2a eefc0756

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

+4 −4
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,
@@ -567,8 +567,8 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { 
                .getCurrentWindowLayoutInfo(taskProperties.getDisplayId(),

                        taskConfiguration.windowConfiguration);

        final SplitAttributesCalculatorParams params = new SplitAttributesCalculatorParams(

                taskWindowMetrics, taskConfiguration, defaultSplitAttributes,

                isDefaultMinSizeSatisfied, windowLayoutInfo, rule.getTag());

                taskWindowMetrics, taskConfiguration, windowLayoutInfo, defaultSplitAttributes,

                areDefaultConstraintsSatisfied, rule.getTag());

        final SplitAttributes splitAttributes = calculator.apply(params);

        return sanitizeSplitAttributes(taskProperties, splitAttributes, minDimensionsPair);

    }