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

Commit 818a5031 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Set 2-pane placeholder for all alias of SettingsHomepageActivity" into... 

Merge "Set 2-pane placeholder for all alias of SettingsHomepageActivity" into sc-v2-dev am: 72cef4f3 am: 47bab413

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

Change-Id: I5c38ac0638a77873b24a09c9c0474c1e0dca06db
parents bf5a327c 47bab413

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

+5 −0
Original line number Diff line number Diff line
@@ -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<ActivityFilter> 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(

src/com/android/settings/homepage/SettingsHomepageActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -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;