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

This commit is contained in:
TreeHugger Robot
2023-01-11 13:21:03 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 3 deletions

View File

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