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

Commit 6014caf4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev

parents 67b00f00 1881749f

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

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.util.Log; 


import androidx.window.embedding.ActivityFilter;

import androidx.window.embedding.ActivityRule;

import androidx.window.embedding.EmbeddingAspectRatio;

import androidx.window.embedding.RuleController;

import androidx.window.embedding.SplitAttributes;

import androidx.window.embedding.SplitPairFilter;
@@ -110,6 +111,7 @@ public class ActivityEmbeddingRulesController { 
                .setClearTop(clearTop)

                .setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp())

                .setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())

                .setMaxAspectRatioInPortrait(EmbeddingAspectRatio.alwaysAllow())

                .setDefaultSplitAttributes(attributes)

                .build();

        RuleController.getInstance(context).addRule(splitPairRule);
@@ -230,6 +232,7 @@ public class ActivityEmbeddingRulesController { 
                activityFilters, intent)

                .setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp())

                .setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())

                .setMaxAspectRatioInPortrait(EmbeddingAspectRatio.alwaysAllow())

                .setSticky(false)

                .setFinishPrimaryWithPlaceholder(SplitRule.FinishBehavior.ADJACENT)

                .setDefaultSplitAttributes(attributes)