commit b2358c6cceae76feff4134b301727577566a36f0
author Yuri Ufimtsev <yufimtsev@google.com> Fri Mar 18 07:33:10 2022 +0000
committer Yuri Ufimtsev <yufimtsev@google.com> Tue Mar 22 08:54:16 2022 +0000
tree de8496106149e619ff0d9574c9c7fb4e6d953da7
parent 45436a025c36de3d48a8571128a372d49ef8bd46

Register Safety Center as SubSetting for two-pane mode

Test: manual

Bug: 225166059
Change-Id: I3e6e877154a2ec831ce5f72f0aa8ec67023f09dd

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

diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
index 124bb4f..d883272 100644
--- a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
+++ b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
@@ -52,6 +52,8 @@
 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 @@
                 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 @@
     }
 
     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,