From eefc0756bda66e7148fc784e285a58e4f83fd786 Mon Sep 17 00:00:00 2001 From: Chris Li Date: Mon, 9 Jan 2023 14:54:23 +0800 Subject: 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 --- .../window/extensions/embedding/SplitPresenter.java | 8 ++++---- .../Jetpack/window-extensions-release.aar | Bin 34377 -> 34425 bytes 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libs/WindowManager') 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 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 Binary files a/libs/WindowManager/Jetpack/window-extensions-release.aar and b/libs/WindowManager/Jetpack/window-extensions-release.aar differ -- cgit v1.2.3-59-g8ed1b