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

Commit d5e799cb authored by Diego Vela's avatar Diego Vela Committed by Automerger Merge Worker
Browse files

Merge "WM Jetpack interface update in Settings" into sc-v2-dev am: 4659ba56 am: 67c99772 

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

Change-Id: I8119c9be7796dce08644b6e402a702e8e04fb09b
parents acde5d2e 67c99772

libs/window_ext_lib.aar

−23.3 KiB (137 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

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

+8 −7
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public class ActivityEmbeddingRulesController { 


    public ActivityEmbeddingRulesController(Context context) {

        mContext = context;

        mSplitController = new SplitController(context);

        mSplitController = SplitController.getInstance();

    }



    /**
@@ -77,10 +77,9 @@ public class ActivityEmbeddingRulesController { 
            boolean finishPrimaryWithSecondary, boolean finishSecondaryWithPrimary) {

        final Set<SplitPairFilter> filters = new HashSet<>();

        filters.add(new SplitPairFilter(primary, secondary,

                null /* secondaryActivityIntentAction */,

                null /* secondaryActivityIntentCategory */));

                null /* secondaryActivityIntentAction */));



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

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

                finishPrimaryWithSecondary,

                finishSecondaryWithPrimary, true /* clearTop */,

                ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(context),
@@ -91,10 +90,12 @@ public class ActivityEmbeddingRulesController { 


    private void registerHomepagePlaceholderRule() {

        final Set<ActivityFilter> activityFilters = new HashSet<>();

        activityFilters.add(new ActivityFilter(getComponentName(SettingsHomepageActivity.class)));

        activityFilters.add(new ActivityFilter(getComponentName(Settings.class)));

        activityFilters.add(new ActivityFilter(getComponentName(SettingsHomepageActivity.class),

                null /* intentAction */));

        activityFilters.add(new ActivityFilter(getComponentName(Settings.class),

                null /* intentAction */));

        activityFilters.add(new ActivityFilter(new ComponentName(Utils.SETTINGS_PACKAGE_NAME,

                SettingsHomepageActivity.ALIAS_DEEP_LINK)));

                SettingsHomepageActivity.ALIAS_DEEP_LINK), null /* intentAction */));

        final Intent intent = new Intent();

        intent.setComponent(getComponentName(Settings.NetworkDashboardActivity.class));

        final SplitPlaceholderRule placeholderRule = new SplitPlaceholderRule(

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

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public class ActivityEmbeddingUtils { 
    public static boolean isEmbeddingActivityEnabled(Context context) {

        final boolean isFlagEnabled = FeatureFlagUtils.isEnabled(context,

                FeatureFlagUtils.SETTINGS_SUPPORT_LARGE_SCREEN);

        final boolean isSplitSupported = new SplitController(context).isSplitSupported();

        final boolean isSplitSupported = SplitController.getInstance().isSplitSupported();



        Log.d(TAG, "isFlagEnabled = " + isFlagEnabled);

        Log.d(TAG, "isSplitSupported = " + isSplitSupported);