From 82eeacf275ed580e94cab5e11f190e47f2d4b00b Mon Sep 17 00:00:00 2001 From: Arc Wang Date: Fri, 5 Nov 2021 16:18:19 +0800 Subject: [PATCH] [Large screen] Set SplitPairRule for DeepLinkHomepageActivity Setting app should set SplitPairRule for all the alias of SettingsHomepageActivity to handle all the different launch cases. Bug: 204156913 Bug: 204399375 Test: manual 1. Launch settings in unfold screen 2. Fold screen 3. Launch wallpaper app 4. Unfold screen Change-Id: I3ad33a750ef19390bc8dc3fb4dc6f1c80630d57f --- .../ActivityEmbeddingRulesController.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java index 53e80203d35..d3d53a85143 100644 --- a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java +++ b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java @@ -109,6 +109,16 @@ public class ActivityEmbeddingRulesController { true /* finishSecondaryWithPrimary */, clearTop); + registerTwoPanePairRule( + context, + new ComponentName(Utils.SETTINGS_PACKAGE_NAME, + SettingsHomepageActivity.ALIAS_DEEP_LINK), + secondaryComponent, + secondaryIntentAction, + true /* finishPrimaryWithSecondary */, + true /* finishSecondaryWithPrimary */, + clearTop); + registerTwoPanePairRule( context, getComponentName(context, SettingsHomepageActivity.class),