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

Commit 356292a1 authored by Andrii Kulian's avatar Andrii Kulian Committed by Diego Vela
Browse files

WM Jetpack interface update in Settings 

Updating to the latest version of the library
that's added in the topic.

Bug: 199676595
Test: Build, install and test Settings
Change-Id: Ia08314a93c4b5263e2fb6c06a5b517a74e9e3745
parent e7cca4cd

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);