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

Commit b2358c6c authored by Yuri Ufimtsev's avatar Yuri Ufimtsev
Browse files

Register Safety Center as SubSetting for two-pane mode 

Test: manual

Bug: 225166059
Change-Id: I3e6e877154a2ec831ce5f72f0aa8ec67023f09dd
parent 45436a02

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

+10 −2
Original line number Diff line number Diff line
@@ -52,6 +52,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;
@@ -187,6 +189,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() {
@@ -226,8 +235,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,