Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81ee016a authored by Chris Li's avatar Chris Li Committed by Anvesh Renikindi
Browse files

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 af2b07b2)
(cherry picked from commit 10924868)
parent 64fd489c

src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,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);
@@ -232,7 +232,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)