Merge "Update EmbeddingAspectRatio to the latest"
This commit is contained in:
committed by
Android (Google) Code Review
commit
eaf3ecceae
@@ -112,7 +112,7 @@ public class ActivityEmbeddingRulesController {
|
|||||||
.setClearTop(clearTop)
|
.setClearTop(clearTop)
|
||||||
.setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp())
|
.setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp())
|
||||||
.setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())
|
.setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())
|
||||||
.setMaxAspectRatioInPortrait(EmbeddingAspectRatio.alwaysAllow())
|
.setMaxAspectRatioInPortrait(EmbeddingAspectRatio.ALWAYS_ALLOW)
|
||||||
.setDefaultSplitAttributes(attributes)
|
.setDefaultSplitAttributes(attributes)
|
||||||
.build();
|
.build();
|
||||||
RuleController.getInstance(context).addRule(splitPairRule);
|
RuleController.getInstance(context).addRule(splitPairRule);
|
||||||
@@ -233,7 +233,7 @@ public class ActivityEmbeddingRulesController {
|
|||||||
activityFilters, intent)
|
activityFilters, intent)
|
||||||
.setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp())
|
.setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp())
|
||||||
.setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())
|
.setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())
|
||||||
.setMaxAspectRatioInPortrait(EmbeddingAspectRatio.alwaysAllow())
|
.setMaxAspectRatioInPortrait(EmbeddingAspectRatio.ALWAYS_ALLOW)
|
||||||
.setSticky(false)
|
.setSticky(false)
|
||||||
.setFinishPrimaryWithPlaceholder(SplitRule.FinishBehavior.ADJACENT)
|
.setFinishPrimaryWithPlaceholder(SplitRule.FinishBehavior.ADJACENT)
|
||||||
.setDefaultSplitAttributes(attributes)
|
.setDefaultSplitAttributes(attributes)
|
||||||
|
Reference in New Issue
Block a user