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

WM Jetpack interface update in Settings

Browse Source 
Updating to the latest version of the library
that's added in the topic.

Bug: 199676595
Test: Build, install and test Settings
Change-Id: Ia08314a93c4b5263e2fb6c06a5b517a74e9e3745
This commit is contained in:
Andrii Kulian
2021-09-13 15:40:44 -07:00
committed by Diego Vela
parent e7cca4cd81
commit 356292a1ee
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) { public ActivityEmbeddingRulesController(Context context) {
mContext = context; mContext = context;
mSplitController = new SplitController(context); mSplitController = SplitController.getInstance();
} }
/** /**
@@ -77,10 +77,9 @@ public class ActivityEmbeddingRulesController {
boolean finishPrimaryWithSecondary, boolean finishSecondaryWithPrimary) { boolean finishPrimaryWithSecondary, boolean finishSecondaryWithPrimary) {
final Set<SplitPairFilter> filters = new HashSet<>(); final Set<SplitPairFilter> filters = new HashSet<>();
filters.add(new SplitPairFilter(primary, secondary, filters.add(new SplitPairFilter(primary, secondary,
null /* secondaryActivityIntentAction */, null /* secondaryActivityIntentAction */));
null /* secondaryActivityIntentCategory */));
new SplitController(context).registerRule(new SplitPairRule(filters, SplitController.getInstance().registerRule(new SplitPairRule(filters,
finishPrimaryWithSecondary, finishPrimaryWithSecondary,
finishSecondaryWithPrimary, true /* clearTop */, finishSecondaryWithPrimary, true /* clearTop */,
ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(context), ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(context),
@@ -91,10 +90,12 @@ public class ActivityEmbeddingRulesController {
private void registerHomepagePlaceholderRule() { private void registerHomepagePlaceholderRule() {
final Set<ActivityFilter> activityFilters = new HashSet<>(); final Set<ActivityFilter> activityFilters = new HashSet<>();
activityFilters.add(new ActivityFilter(getComponentName(SettingsHomepageActivity.class))); activityFilters.add(new ActivityFilter(getComponentName(SettingsHomepageActivity.class),
activityFilters.add(new ActivityFilter(getComponentName(Settings.class))); null /* intentAction */));
activityFilters.add(new ActivityFilter(getComponentName(Settings.class),
null /* intentAction */));
activityFilters.add(new ActivityFilter(new ComponentName(Utils.SETTINGS_PACKAGE_NAME, 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(); final Intent intent = new Intent();
intent.setComponent(getComponentName(Settings.NetworkDashboardActivity.class)); intent.setComponent(getComponentName(Settings.NetworkDashboardActivity.class));
final SplitPlaceholderRule placeholderRule = new SplitPlaceholderRule( 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) { public static boolean isEmbeddingActivityEnabled(Context context) {
final boolean isFlagEnabled = FeatureFlagUtils.isEnabled(context, final boolean isFlagEnabled = FeatureFlagUtils.isEnabled(context,
FeatureFlagUtils.SETTINGS_SUPPORT_LARGE_SCREEN); 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, "isFlagEnabled = " + isFlagEnabled);
Log.d(TAG, "isSplitSupported = " + isSplitSupported); Log.d(TAG, "isSplitSupported = " + isSplitSupported);