Merge "[Large screen] Make slice deep linking to Settings show in 2-pane" into sc-v2-dev

This commit is contained in:
Jason Chiu
2021-11-01 02:10:21 +00:00
committed by Android (Google) Code Review
6 changed files with 126 additions and 28 deletions

View File

@@ -41,7 +41,7 @@ import java.util.Set;
/** A class to initialize split rules for activity embedding. */
public class ActivityEmbeddingRulesController {
private static final String TAG = "ActivityEmbeddingCtrl ";
private static final String TAG = "ActivityEmbeddingCtrl";
private final Context mContext;
private final SplitController mSplitController;
@@ -128,11 +128,6 @@ public class ActivityEmbeddingRulesController {
null /* intentAction */));
}
private void addActivityFilter(Set<ActivityFilter> activityFilters, Intent intent) {
activityFilters.add(new ActivityFilter(new ComponentName("*" /* pkg */, "*" /* cls */),
intent.getAction()));
}
private void addActivityFilter(Set<ActivityFilter> activityFilters,
ComponentName componentName) {
activityFilters.add(new ActivityFilter(componentName, null /* intentAction */));