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

Commit d4165ec9 authored by Yuri Ufimtsev's avatar Yuri Ufimtsev Committed by Automerger Merge Worker
Browse files

Merge "Register Safety Center as SubSetting for two-pane mode" into tm-dev am: b39ab3e1 

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

Change-Id: Ied8cb07c3ddd89a28e167c6eb18eaea534c6a250
parents b1469cce b39ab3e1

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

+10 −2
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ import java.util.Set; 
public class ActivityEmbeddingRulesController {



    private static final String TAG = "ActivityEmbeddingCtrl";

    private static final ComponentName COMPONENT_NAME_WILDCARD = new ComponentName(

            "*" /* pkg */, "*" /* cls */);

    private final Context mContext;

    private final SplitController mSplitController;
@@ -188,6 +190,13 @@ public class ActivityEmbeddingRulesController { 
                new ComponentName(context, SubSettings.class),

                null /* secondaryIntentAction */,

                clearTop);



        registerTwoPanePairRuleForSettingsHome(

                context,

                COMPONENT_NAME_WILDCARD,

                Intent.ACTION_SAFETY_CENTER,

                clearTop

        );

    }



    private void registerHomepagePlaceholderRule() {
@@ -228,8 +237,7 @@ public class ActivityEmbeddingRulesController { 
    }



    private static void addActivityFilter(Set<ActivityFilter> activityFilters, Intent intent) {

        activityFilters.add(new ActivityFilter(new ComponentName("*" /* pkg */, "*" /* cls */),

                intent.getAction()));

        activityFilters.add(new ActivityFilter(COMPONENT_NAME_WILDCARD, intent.getAction()));

    }



    private void addActivityFilter(Set<ActivityFilter> activityFilters,