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

Merge "[Large screen] Shows SearchActivity at right pane" into sc-v2-dev am: 527667b375

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

Change-Id: Ic97c1ecba5d4502f97ab0972cd0042f8dfaf9e58
This commit is contained in:
Arc Wang
2021-10-27 06:16:16 +00:00
committed by Automerger Merge Worker
parent fb86b8e360 527667b375
commit 369884106e
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,6 @@
package com.android.settings.activityembedding;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -26,7 +25,6 @@ import android.util.Log;
import androidx.annotation.NonNull;
import androidx.window.embedding.ActivityFilter;
import androidx.window.embedding.ActivityRule;
import androidx.window.embedding.SplitController;
import androidx.window.embedding.SplitPairFilter;
import androidx.window.embedding.SplitPairRule;
@@ -36,7 +34,6 @@ 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.overlay.FeatureFactory;
import java.util.HashSet;
import java.util.Set;
@@ -73,8 +70,6 @@ public class ActivityEmbeddingRulesController {
null /* secondaryIntentAction */,
true /* finishPrimaryWithSecondary */,
true /* finishSecondaryWithPrimary */);
// Set rules here to show full screen for specified Activity.
registerAlwaysExpandRule();
}
/** Register a SplitPairRule for 2-pane. */
@@ -98,16 +93,6 @@ public class ActivityEmbeddingRulesController {
LayoutDirection.LOCALE));
}
private void registerAlwaysExpandRule() {
final Set<ActivityFilter> activityFilters = new HashSet<>();
final Intent searchIntent = FeatureFactory.getFactory(mContext).getSearchFeatureProvider()
.buildSearchIntent(mContext, SettingsEnums.SETTINGS_HOMEPAGE);
addActivityFilter(activityFilters, searchIntent);
mSplitController.registerRule(new ActivityRule(activityFilters, true /* alwaysExpand */));
}
private void registerHomepagePlaceholderRule() {
final Set<ActivityFilter> activityFilters = new HashSet<>();
addActivityFilter(activityFilters, SettingsHomepageActivity.class);