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
This commit is contained in:
@@ -555,9 +555,9 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer {
|
|||||||
final Function<SplitAttributesCalculatorParams, SplitAttributes> calculator =
|
final Function<SplitAttributesCalculatorParams, SplitAttributes> calculator =
|
||||||
mController.getSplitAttributesCalculator();
|
mController.getSplitAttributesCalculator();
|
||||||
final SplitAttributes defaultSplitAttributes = rule.getDefaultSplitAttributes();
|
final SplitAttributes defaultSplitAttributes = rule.getDefaultSplitAttributes();
|
||||||
final boolean isDefaultMinSizeSatisfied = rule.checkParentMetrics(taskWindowMetrics);
|
final boolean areDefaultConstraintsSatisfied = rule.checkParentMetrics(taskWindowMetrics);
|
||||||
if (calculator == null) {
|
if (calculator == null) {
|
||||||
if (!isDefaultMinSizeSatisfied) {
|
if (!areDefaultConstraintsSatisfied) {
|
||||||
return EXPAND_CONTAINERS_ATTRIBUTES;
|
return EXPAND_CONTAINERS_ATTRIBUTES;
|
||||||
}
|
}
|
||||||
return sanitizeSplitAttributes(taskProperties, defaultSplitAttributes,
|
return sanitizeSplitAttributes(taskProperties, defaultSplitAttributes,
|
||||||
@@ -567,8 +567,8 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer {
|
|||||||
.getCurrentWindowLayoutInfo(taskProperties.getDisplayId(),
|
.getCurrentWindowLayoutInfo(taskProperties.getDisplayId(),
|
||||||
taskConfiguration.windowConfiguration);
|
taskConfiguration.windowConfiguration);
|
||||||
final SplitAttributesCalculatorParams params = new SplitAttributesCalculatorParams(
|
final SplitAttributesCalculatorParams params = new SplitAttributesCalculatorParams(
|
||||||
taskWindowMetrics, taskConfiguration, defaultSplitAttributes,
|
taskWindowMetrics, taskConfiguration, windowLayoutInfo, defaultSplitAttributes,
|
||||||
isDefaultMinSizeSatisfied, windowLayoutInfo, rule.getTag());
|
areDefaultConstraintsSatisfied, rule.getTag());
|
||||||
final SplitAttributes splitAttributes = calculator.apply(params);
|
final SplitAttributes splitAttributes = calculator.apply(params);
|
||||||
return sanitizeSplitAttributes(taskProperties, splitAttributes, minDimensionsPair);
|
return sanitizeSplitAttributes(taskProperties, splitAttributes, minDimensionsPair);
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user