Register Safety Center as SubSetting for two-pane mode

Test: manual

Bug: 225166059
Change-Id: I3e6e877154a2ec831ce5f72f0aa8ec67023f09dd
This commit is contained in:
Yuri Ufimtsev
2022-03-18 07:33:10 +00:00
parent 45436a025c
commit b2358c6cce

View File

@@ -52,6 +52,8 @@ import java.util.Set;
public class ActivityEmbeddingRulesController { public class ActivityEmbeddingRulesController {
private static final String TAG = "ActivityEmbeddingCtrl"; private static final String TAG = "ActivityEmbeddingCtrl";
private static final ComponentName COMPONENT_NAME_WILDCARD = new ComponentName(
"*" /* pkg */, "*" /* cls */);
private final Context mContext; private final Context mContext;
private final SplitController mSplitController; private final SplitController mSplitController;
@@ -187,6 +189,13 @@ public class ActivityEmbeddingRulesController {
new ComponentName(context, SubSettings.class), new ComponentName(context, SubSettings.class),
null /* secondaryIntentAction */, null /* secondaryIntentAction */,
clearTop); clearTop);
registerTwoPanePairRuleForSettingsHome(
context,
COMPONENT_NAME_WILDCARD,
Intent.ACTION_SAFETY_CENTER,
clearTop
);
} }
private void registerHomepagePlaceholderRule() { private void registerHomepagePlaceholderRule() {
@@ -226,8 +235,7 @@ public class ActivityEmbeddingRulesController {
} }
private static void addActivityFilter(Set<ActivityFilter> activityFilters, Intent intent) { private static void addActivityFilter(Set<ActivityFilter> activityFilters, Intent intent) {
activityFilters.add(new ActivityFilter(new ComponentName("*" /* pkg */, "*" /* cls */), activityFilters.add(new ActivityFilter(COMPONENT_NAME_WILDCARD, intent.getAction()));
intent.getAction()));
} }
private void addActivityFilter(Set<ActivityFilter> activityFilters, private void addActivityFilter(Set<ActivityFilter> activityFilters,