summaryrefslogtreecommitdiff
path: root/libs/WindowManager/Jetpack
diff options
context:
space:
mode:
author Chris Li <lihongyu@google.com> 2023-01-09 14:54:23 +0800
committer Chris Li <lihongyu@google.com> 2023-01-11 08:52:54 +0000
commiteefc0756bda66e7148fc784e285a58e4f83fd786 (patch)
tree8ce65b9d2036dff70216f0e39b7b76d1f46652d8 /libs/WindowManager/Jetpack
parent4326b85ba0349a25b1c32e06288b872f255baeac (diff)
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
Diffstat (limited to 'libs/WindowManager/Jetpack')
-rw-r--r--libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java8
-rw-r--r--libs/WindowManager/Jetpack/window-extensions-release.aarbin34377 -> 34425 bytes
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java
index d9abe8e040ba..668a7d5aa9b6 100644
--- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java
+++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java
@@ -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);
}
diff --git a/libs/WindowManager/Jetpack/window-extensions-release.aar b/libs/WindowManager/Jetpack/window-extensions-release.aar
index a939cd8a1745..5de5365e4d03 100644
--- a/libs/WindowManager/Jetpack/window-extensions-release.aar
+++ b/libs/WindowManager/Jetpack/window-extensions-release.aar
Binary files differ