Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2023-01-11 13:21:03 +00:00
committed by Android (Google) Code Review
parent ba93541826 a1f939b81c
commit c5978eaf77
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,
@@ -568,7 +568,7 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer {
taskConfiguration.windowConfiguration); taskConfiguration.windowConfiguration);
final SplitAttributesCalculatorParams params = new SplitAttributesCalculatorParams( final SplitAttributesCalculatorParams params = new SplitAttributesCalculatorParams(
taskWindowMetrics, taskConfiguration, windowLayoutInfo, defaultSplitAttributes, taskWindowMetrics, taskConfiguration, windowLayoutInfo, defaultSplitAttributes,
isDefaultMinSizeSatisfied, 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);
} }

BIN
libs/WindowManager/Jetpack/window-extensions-release.aar
View File

Binary file not shown.