From 77a23c9ce22dcf4d9aecbf35a8959f577415af77 Mon Sep 17 00:00:00 2001 From: Chris Li Date: Wed, 22 Feb 2023 11:12:50 +0800 Subject: [PATCH] Update EmbeddingAspectRatio to the latest alwaysAllow() is changed to ALWAYS_ALLOW per API Council feedback. Bug: 270160592 Test: build Change-Id: I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 (cherry picked from commit af2b07b248730bc9dff48d29c1dfdb7a77f41aed) (cherry picked from commit 10924868730d9cbfc4567ed08cc1c9380426b188) --- .../activityembedding/ActivityEmbeddingRulesController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java index e1a052edb10..d7c4d43f73b 100644 --- a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java +++ b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java @@ -108,7 +108,7 @@ public class ActivityEmbeddingRulesController { .setClearTop(clearTop) .setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp()) .setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp()) - .setMaxAspectRatioInPortrait(EmbeddingAspectRatio.alwaysAllow()) + .setMaxAspectRatioInPortrait(EmbeddingAspectRatio.ALWAYS_ALLOW) .setDefaultSplitAttributes(attributes) .build(); RuleController.getInstance(context).addRule(splitPairRule); @@ -229,7 +229,7 @@ public class ActivityEmbeddingRulesController { activityFilters, intent) .setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp()) .setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp()) - .setMaxAspectRatioInPortrait(EmbeddingAspectRatio.alwaysAllow()) + .setMaxAspectRatioInPortrait(EmbeddingAspectRatio.ALWAYS_ALLOW) .setSticky(false) .setFinishPrimaryWithPlaceholder(SplitRule.FinishBehavior.ADJACENT) .setDefaultSplitAttributes(attributes)