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

Commit e3f34ef7 authored by Tsung-Mao Fang's avatar Tsung-Mao Fang Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I51b34f59603d0fc78679402ca951e90743f67c6b
parents 2c61c57b 04c75156

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

+13 −1
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ import androidx.preference.SwitchPreference; 
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 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider { 
                }

                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);