diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java index 994098083ba..a0f4aad4153 100644 --- a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java +++ b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java @@ -32,6 +32,8 @@ import androidx.window.embedding.SplitPlaceholderRule; import com.android.settings.Settings; import com.android.settings.SubSettings; +import com.android.settings.Utils; +import com.android.settings.homepage.SettingsHomepageActivity; import java.util.HashSet; import java.util.Set; @@ -89,7 +91,10 @@ public class ActivityEmbeddingRulesController { private void registerHomepagePlaceholderRule() { final Set activityFilters = new HashSet<>(); + activityFilters.add(new ActivityFilter(getComponentName(SettingsHomepageActivity.class))); activityFilters.add(new ActivityFilter(getComponentName(Settings.class))); + activityFilters.add(new ActivityFilter(new ComponentName(Utils.SETTINGS_PACKAGE_NAME, + SettingsHomepageActivity.ALIAS_DEEP_LINK))); final Intent intent = new Intent(); intent.setComponent(getComponentName(Settings.NetworkDashboardActivity.class)); final SplitPlaceholderRule placeholderRule = new SplitPlaceholderRule( diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java index 73f0abb1f2c..4a0a912323c 100644 --- a/src/com/android/settings/homepage/SettingsHomepageActivity.java +++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java @@ -62,7 +62,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements public static final String EXTRA_IS_FROM_SETTINGS_HOMEPAGE = "is_from_settings_homepage"; // An alias class name of SettingsHomepageActivity. - private static final String ALIAS_DEEP_LINK = "com.android.settings.DeepLinkHomepageActivity"; + public static final String ALIAS_DEEP_LINK = "com.android.settings.DeepLinkHomepageActivity"; private static final long HOMEPAGE_LOADING_TIMEOUT_MS = 300;