commit 04c7515603b273c49d2f765048da4fe56dce4a49
author Tsung-Mao Fang <tmfang@google.com> Fri Oct 29 09:45:24 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 29 09:45:24 2021 +0000
tree b1df1408c7cc78913c102f11725182a0b3e11393
parent 1fe930bd06d49a08f2f46e430711471fde5ba16b
parent 29063a7981022a708c0b99abba05111b803f6683

Merge "Register the rule for injected apps" into sc-v2-dev am: 29063a7981

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

Change-Id: I8665e1e055bf237b7d1a1f261b8eb7a3a9cf19cf

src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java

diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index f8185db..2def817 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -60,6 +60,8 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
+import com.android.settings.activityembedding.ActivityEmbeddingRulesController;
+import com.android.settings.activityembedding.ActivityEmbeddingUtils;
 import com.android.settings.dashboard.profileselector.ProfileSelectDialog;
 import com.android.settings.homepage.TopLevelSettings;
 import com.android.settings.overlay.FeatureFactory;
@@ -170,7 +172,17 @@
                 }
                 pref.setOnPreferenceClickListener(preference -> {
                     OnCancelListener listener = null;
-                    if (fragment instanceof TopLevelSettings) {
+                    if (fragment instanceof TopLevelSettings
+                            && ActivityEmbeddingUtils.isEmbeddingActivityEnabled(mContext)) {
+                        // Register the rule for injected apps.
+                        ActivityEmbeddingRulesController.registerTwoPanePairRule(mContext,
+                                new ComponentName(activity.getPackageName(),
+                                        com.android.settings.Settings.class.getName()),
+                                new ComponentName(tile.getPackageName(),
+                                        tile.getComponentName()),
+                                null, true, true);
+
+                        // Highlight preference ui.
                         final TopLevelSettings topLevelSettings = (TopLevelSettings) fragment;
                         // Highlight the tile immediately whenever it's clicked
                         topLevelSettings.setHighlightPreferenceKey(key);