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

Commit 68cb4dea authored by Andrii Kulian's avatar Andrii Kulian Committed by Automerger Merge Worker
Browse files

Merge "Sticky placeholder and adjacent finish rule in Settings" into sc-v2-dev... 

Merge "Sticky placeholder and adjacent finish rule in Settings" into sc-v2-dev am: 0ac5228e am: aa8cf9bc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16176771

Change-Id: I5a4b1f2fe3736d6f1a9a5fcb1ca6b1a576296c81
parents c320ef33 aa8cf9bc

libs/window_ext_lib.aar

+6.56 KiB (143 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

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

+5 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import androidx.window.embedding.SplitController; 
import androidx.window.embedding.SplitPairFilter;

import androidx.window.embedding.SplitPairRule;

import androidx.window.embedding.SplitPlaceholderRule;

import androidx.window.embedding.SplitRule;



import com.android.settings.Settings;

import com.android.settings.SubSettings;
@@ -81,8 +82,8 @@ public class ActivityEmbeddingRulesController { 
                secondaryIntentAction));



        SplitController.getInstance().registerRule(new SplitPairRule(filters,

                finishPrimaryWithSecondary,

                finishSecondaryWithPrimary,

                finishPrimaryWithSecondary ? SplitRule.FINISH_ADJACENT : SplitRule.FINISH_NEVER,

                finishSecondaryWithPrimary ? SplitRule.FINISH_ADJACENT : SplitRule.FINISH_NEVER,

                clearTop,

                ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(context),

                ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthPx(context),
@@ -154,6 +155,8 @@ public class ActivityEmbeddingRulesController { 
        final SplitPlaceholderRule placeholderRule = new SplitPlaceholderRule(

                activityFilters,

                intent,

                true /* stickyPlaceholder */,

                SplitRule.FINISH_ADJACENT,

                ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(mContext),

                ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthPx(mContext),

                ActivityEmbeddingUtils.SPLIT_RATIO,