Merge "Update EmbeddingAspectRatio to the latest"

This commit is contained in:
Anvesh Renikindi
2023-02-23 06:38:08 +00:00
committed by Android (Google) Code Review

View File

@@ -112,7 +112,7 @@ public class ActivityEmbeddingRulesController {
.setClearTop(clearTop) .setClearTop(clearTop)
.setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp()) .setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp())
.setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp()) .setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())
.setMaxAspectRatioInPortrait(EmbeddingAspectRatio.alwaysAllow()) .setMaxAspectRatioInPortrait(EmbeddingAspectRatio.ALWAYS_ALLOW)
.setDefaultSplitAttributes(attributes) .setDefaultSplitAttributes(attributes)
.build(); .build();
RuleController.getInstance(context).addRule(splitPairRule); RuleController.getInstance(context).addRule(splitPairRule);
@@ -233,7 +233,7 @@ public class ActivityEmbeddingRulesController {
activityFilters, intent) activityFilters, intent)
.setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp()) .setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp())
.setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp()) .setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())
.setMaxAspectRatioInPortrait(EmbeddingAspectRatio.alwaysAllow()) .setMaxAspectRatioInPortrait(EmbeddingAspectRatio.ALWAYS_ALLOW)
.setSticky(false) .setSticky(false)
.setFinishPrimaryWithPlaceholder(SplitRule.FinishBehavior.ADJACENT) .setFinishPrimaryWithPlaceholder(SplitRule.FinishBehavior.ADJACENT)
.setDefaultSplitAttributes(attributes) .setDefaultSplitAttributes(attributes)