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

Commit 8061973e authored by Andrii Kulian's avatar Andrii Kulian
Browse files

Sticky placeholder and adjacent finish rule in Settings 

Bug: 204829538
Test: Open Settings in landscape in two panes, rotate to portrait to stack, rotate back to split
Change-Id: I5790962051d0b01902f3b50e958848eff7cf7334
parent 5afb04e1

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,