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

Commit c6049dfa authored by Natnael Belay's avatar Natnael Belay Committed by Android (Google) Code Review
Browse files

Merge "Update EmbeddingAspectRatio to the latest" into tm-qpr-dev-plus-aosp

parents 97ee8a84 10924868

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)