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

Merge "WM Jetpack interface update in Settings" into sc-v2-dev

Browse Source
This commit is contained in:
Diego Vela
2021-09-23 23:53:06 +00:00
committed by Android (Google) Code Review
parent eb79498e0f 356292a1ee
commit 4659ba56d9
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
libs/window_ext_lib.aar
View File

Binary file not shown.

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

@@ -47,7 +47,7 @@ public class ActivityEmbeddingRulesController {
public ActivityEmbeddingRulesController(Context context) {
mContext = context;
mSplitController = new SplitController(context);
mSplitController = SplitController.getInstance();
}
/**
@@ -77,10 +77,9 @@ public class ActivityEmbeddingRulesController {
boolean finishPrimaryWithSecondary, boolean finishSecondaryWithPrimary) {
final Set<SplitPairFilter> filters = new HashSet<>();
filters.add(new SplitPairFilter(primary, secondary,
null /* secondaryActivityIntentAction */,
null /* secondaryActivityIntentCategory */));
null /* secondaryActivityIntentAction */));
new SplitController(context).registerRule(new SplitPairRule(filters,
SplitController.getInstance().registerRule(new SplitPairRule(filters,
finishPrimaryWithSecondary,
finishSecondaryWithPrimary, true /* clearTop */,
ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(context),
@@ -91,10 +90,12 @@ public class ActivityEmbeddingRulesController {
private void registerHomepagePlaceholderRule() {
final Set<ActivityFilter> activityFilters = new HashSet<>();
activityFilters.add(new ActivityFilter(getComponentName(SettingsHomepageActivity.class)));
activityFilters.add(new ActivityFilter(getComponentName(Settings.class)));
activityFilters.add(new ActivityFilter(getComponentName(SettingsHomepageActivity.class),
null /* intentAction */));
activityFilters.add(new ActivityFilter(getComponentName(Settings.class),
null /* intentAction */));
activityFilters.add(new ActivityFilter(new ComponentName(Utils.SETTINGS_PACKAGE_NAME,
SettingsHomepageActivity.ALIAS_DEEP_LINK)));
SettingsHomepageActivity.ALIAS_DEEP_LINK), null /* intentAction */));
final Intent intent = new Intent();
intent.setComponent(getComponentName(Settings.NetworkDashboardActivity.class));
final SplitPlaceholderRule placeholderRule = new SplitPlaceholderRule(

2
src/com/android/settings/activityembedding/ActivityEmbeddingUtils.java
View File

@@ -55,7 +55,7 @@ public class ActivityEmbeddingUtils {
public static boolean isEmbeddingActivityEnabled(Context context) {
final boolean isFlagEnabled = FeatureFlagUtils.isEnabled(context,
FeatureFlagUtils.SETTINGS_SUPPORT_LARGE_SCREEN);
final boolean isSplitSupported = new SplitController(context).isSplitSupported();
final boolean isSplitSupported = SplitController.getInstance().isSplitSupported();
Log.d(TAG, "isFlagEnabled = " + isFlagEnabled);
Log.d(TAG, "isSplitSupported = " + isSplitSupported);