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

Merge "Support highlighting the menu entry for Search results" into sc-v2-dev

Browse Source
This commit is contained in:
Jason Chiu
2021-11-16 07:28:32 +00:00
committed by Android (Google) Code Review
parent 18346ea63d 3af73364ba
commit c144f7bb89
10 changed files with 155 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,7 @@ import com.android.settings.Settings;
import com.android.settings.SubSettings;
import com.android.settings.Utils;
import com.android.settings.homepage.SettingsHomepageActivity;
import com.android.settings.homepage.SliceDeepLinkHomepageActivity;
import java.util.HashSet;
import java.util.Set;
@@ -128,6 +129,15 @@ public class ActivityEmbeddingRulesController {
true /* finishPrimaryWithSecondary */,
true /* finishSecondaryWithPrimary */,
clearTop);
registerTwoPanePairRule(
context,
getComponentName(context, SliceDeepLinkHomepageActivity.class),
secondaryComponent,
secondaryIntentAction,
true /* finishPrimaryWithSecondary */,
true /* finishSecondaryWithPrimary */,
clearTop);
}
/** Register a SplitPairRule for SubSettings if the device supports 2-pane. */