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

Commit 0ac5228e authored by Andrii Kulian's avatar Andrii Kulian Committed by Android (Google) Code Review
Browse files

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

parents 6e12a31e 8061973e

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 Original line Diff line number Diff line
@@ -29,6 +29,7 @@ import androidx.window.embedding.SplitController; 
import androidx.window.embedding.SplitPairFilter;

import androidx.window.embedding.SplitPairFilter;

import androidx.window.embedding.SplitPairRule;

import androidx.window.embedding.SplitPairRule;

import androidx.window.embedding.SplitPlaceholderRule;

import androidx.window.embedding.SplitPlaceholderRule;

import androidx.window.embedding.SplitRule;





import com.android.settings.Settings;

import com.android.settings.Settings;

import com.android.settings.SubSettings;

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

                secondaryIntentAction));





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

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

                finishPrimaryWithSecondary,

                finishPrimaryWithSecondary ? SplitRule.FINISH_ADJACENT : SplitRule.FINISH_NEVER,

                finishSecondaryWithPrimary,

                finishSecondaryWithPrimary ? SplitRule.FINISH_ADJACENT : SplitRule.FINISH_NEVER,

                clearTop,

                clearTop,

                ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(context),

                ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(context),

                ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthPx(context),

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

        final SplitPlaceholderRule placeholderRule = new SplitPlaceholderRule(

                activityFilters,

                activityFilters,

                intent,

                intent,

                true /* stickyPlaceholder */,

                SplitRule.FINISH_ADJACENT,

                ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(mContext),

                ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(mContext),

                ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthPx(mContext),

                ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthPx(mContext),

                ActivityEmbeddingUtils.SPLIT_RATIO,

                ActivityEmbeddingUtils.SPLIT_RATIO,