PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I5c38ac0638a77873b24a09c9c0474c1e0dca06db
This commit is contained in:
TreeHugger Robot
2021-09-09 09:55:22 +00:00
committed by Automerger Merge Worker
parent bf5a327c5d 47bab41397
commit 818a503116
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
View File

@@ -32,6 +32,8 @@ import androidx.window.embedding.SplitPlaceholderRule;
import com.android.settings.Settings; import com.android.settings.Settings;
import com.android.settings.SubSettings; import com.android.settings.SubSettings;
import com.android.settings.Utils;
import com.android.settings.homepage.SettingsHomepageActivity;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
@@ -89,7 +91,10 @@ public class ActivityEmbeddingRulesController {
private void registerHomepagePlaceholderRule() { private void registerHomepagePlaceholderRule() {
final Set<ActivityFilter> activityFilters = new HashSet<>(); final Set<ActivityFilter> activityFilters = new HashSet<>();
activityFilters.add(new ActivityFilter(getComponentName(SettingsHomepageActivity.class)));
activityFilters.add(new ActivityFilter(getComponentName(Settings.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(); final Intent intent = new Intent();
intent.setComponent(getComponentName(Settings.NetworkDashboardActivity.class)); intent.setComponent(getComponentName(Settings.NetworkDashboardActivity.class));
final SplitPlaceholderRule placeholderRule = new SplitPlaceholderRule( final SplitPlaceholderRule placeholderRule = new SplitPlaceholderRule(

2
src/com/android/settings/homepage/SettingsHomepageActivity.java
View File

@@ -62,7 +62,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements
public static final String EXTRA_IS_FROM_SETTINGS_HOMEPAGE = "is_from_settings_homepage"; public static final String EXTRA_IS_FROM_SETTINGS_HOMEPAGE = "is_from_settings_homepage";
// An alias class name of SettingsHomepageActivity. // 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; private static final long HOMEPAGE_LOADING_TIMEOUT_MS = 300;