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

Commit eefc0756 authored by Chris Li's avatar Chris Li
Browse files

Update extensions to rename isDefaultMinSizeSatisfied 

We rename isDefaultMinSizeSatisfied to areDefaultConstraintsSatisfied
because we now check more than size, but also aspect ratio.

Update aar for the change.

Bug: 242970511
Test: build
Change-Id: I333f9507ae25196457efa37702affd0bfab28973
parent 4326b85b

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

    }