Make Settings show in two-pane on portrait tablet
Test: manual - Change Display size and observe
Bug: 211562623
Change-Id: I0c26a7443882cc28edb5500f8d135c5f00dee515
Merged-In: I0c26a7443882cc28edb5500f8d135c5f00dee515
(cherry picked from commit cf3199fc9e
)
This commit is contained in:
@@ -26,6 +26,7 @@ import android.util.Log;
|
|||||||
|
|
||||||
import androidx.window.embedding.ActivityFilter;
|
import androidx.window.embedding.ActivityFilter;
|
||||||
import androidx.window.embedding.ActivityRule;
|
import androidx.window.embedding.ActivityRule;
|
||||||
|
import androidx.window.embedding.EmbeddingAspectRatio;
|
||||||
import androidx.window.embedding.RuleController;
|
import androidx.window.embedding.RuleController;
|
||||||
import androidx.window.embedding.SplitAttributes;
|
import androidx.window.embedding.SplitAttributes;
|
||||||
import androidx.window.embedding.SplitPairFilter;
|
import androidx.window.embedding.SplitPairFilter;
|
||||||
@@ -110,6 +111,7 @@ public class ActivityEmbeddingRulesController {
|
|||||||
.setClearTop(clearTop)
|
.setClearTop(clearTop)
|
||||||
.setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp())
|
.setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp())
|
||||||
.setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())
|
.setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())
|
||||||
|
.setMaxAspectRatioInPortrait(EmbeddingAspectRatio.alwaysAllow())
|
||||||
.setDefaultSplitAttributes(attributes)
|
.setDefaultSplitAttributes(attributes)
|
||||||
.build();
|
.build();
|
||||||
RuleController.getInstance(context).addRule(splitPairRule);
|
RuleController.getInstance(context).addRule(splitPairRule);
|
||||||
@@ -230,6 +232,7 @@ public class ActivityEmbeddingRulesController {
|
|||||||
activityFilters, intent)
|
activityFilters, intent)
|
||||||
.setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp())
|
.setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp())
|
||||||
.setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())
|
.setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())
|
||||||
|
.setMaxAspectRatioInPortrait(EmbeddingAspectRatio.alwaysAllow())
|
||||||
.setSticky(false)
|
.setSticky(false)
|
||||||
.setFinishPrimaryWithPlaceholder(SplitRule.FinishBehavior.ADJACENT)
|
.setFinishPrimaryWithPlaceholder(SplitRule.FinishBehavior.ADJACENT)
|
||||||
.setDefaultSplitAttributes(attributes)
|
.setDefaultSplitAttributes(attributes)
|
||||||
|
Reference in New Issue
Block a user