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

Update ActivityEmbedding usage.

Browse Source 
Bug: 259592300
Test: build.
Change-Id: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
Merged-In: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
(cherry picked from commit a9394d1796)
(cherry picked from commit 65bb5a09f4)
This commit is contained in:
Diego Vela
2022-11-19 00:38:12 +00:00
committed by Anvesh Renikindi
parent 3773ae0d9f
commit d2dfc4285e
6 changed files with 80 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,11 +22,11 @@ import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.util.FeatureFlagUtils;
import android.util.LayoutDirection;
import android.util.Log;
import androidx.window.embedding.ActivityFilter;
import androidx.window.embedding.ActivityRule;
import androidx.window.embedding.SplitAttributes;
import androidx.window.embedding.SplitController;
import androidx.window.embedding.SplitPairFilter;
import androidx.window.embedding.SplitPairRule;
@@ -49,6 +49,7 @@ import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockPattern;
import com.android.settingslib.users.AvatarPickerActivity;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@@ -63,7 +64,7 @@ public class ActivityEmbeddingRulesController {
public ActivityEmbeddingRulesController(Context context) {
mContext = context;
mSplitController = SplitController.getInstance();
mSplitController = SplitController.getInstance(context);
}
/**
@@ -88,8 +89,8 @@ public class ActivityEmbeddingRulesController {
ComponentName primaryComponent,
ComponentName secondaryComponent,
String secondaryIntentAction,
int finishPrimaryWithSecondary,
int finishSecondaryWithPrimary,
SplitRule.FinishBehavior finishPrimaryWithSecondary,
SplitRule.FinishBehavior finishSecondaryWithPrimary,
boolean clearTop) {
if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(context)) {
return;
@@ -98,14 +99,20 @@ public class ActivityEmbeddingRulesController {
filters.add(new SplitPairFilter(primaryComponent, secondaryComponent,
secondaryIntentAction));
SplitController.getInstance().registerRule(new SplitPairRule(filters,
finishPrimaryWithSecondary,
finishSecondaryWithPrimary,
clearTop,
ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(context),
ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthPx(context),
ActivityEmbeddingUtils.getSplitRatio(context),
LayoutDirection.LOCALE));
SplitAttributes attributes = new SplitAttributes.Builder()
.setSplitType(SplitAttributes.SplitType.ratio(
ActivityEmbeddingUtils.getSplitRatio(context)))
.setLayoutDirection(SplitAttributes.LayoutDirection.LOCALE)
.build();
SplitPairRule splitPairRule = new SplitPairRule.Builder(filters)
.setFinishPrimaryWithSecondary(finishPrimaryWithSecondary)
.setFinishSecondaryWithPrimary(finishSecondaryWithPrimary)
.setClearTop(clearTop)
.setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp())
.setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())
.setDefaultSplitAttributes(attributes)
.build();
SplitController.getInstance(context).addRule(splitPairRule);
}
/**
@@ -126,8 +133,10 @@ public class ActivityEmbeddingRulesController {
new ComponentName(context, Settings.class),
secondaryComponent,
secondaryIntentAction,
finishPrimaryWithSecondary ? SplitRule.FINISH_ADJACENT : SplitRule.FINISH_NEVER,
finishSecondaryWithPrimary ? SplitRule.FINISH_ADJACENT : SplitRule.FINISH_NEVER,
finishPrimaryWithSecondary ? SplitRule.FinishBehavior.ADJACENT
: SplitRule.FinishBehavior.NEVER,
finishSecondaryWithPrimary ? SplitRule.FinishBehavior.ADJACENT
: SplitRule.FinishBehavior.NEVER,
clearTop);
registerTwoPanePairRule(
@@ -135,8 +144,10 @@ public class ActivityEmbeddingRulesController {
new ComponentName(context, SettingsHomepageActivity.class),
secondaryComponent,
secondaryIntentAction,
finishPrimaryWithSecondary ? SplitRule.FINISH_ADJACENT : SplitRule.FINISH_NEVER,
finishSecondaryWithPrimary ? SplitRule.FINISH_ADJACENT : SplitRule.FINISH_NEVER,
finishPrimaryWithSecondary ? SplitRule.FinishBehavior.ADJACENT
: SplitRule.FinishBehavior.NEVER,
finishSecondaryWithPrimary ? SplitRule.FinishBehavior.ADJACENT
: SplitRule.FinishBehavior.NEVER,
clearTop);
// We should finish HomePageActivity altogether even if it shows in single pane for all deep
@@ -146,8 +157,10 @@ public class ActivityEmbeddingRulesController {
new ComponentName(context, DeepLinkHomepageActivity.class),
secondaryComponent,
secondaryIntentAction,
finishPrimaryWithSecondary ? SplitRule.FINISH_ALWAYS : SplitRule.FINISH_NEVER,
finishSecondaryWithPrimary ? SplitRule.FINISH_ALWAYS : SplitRule.FINISH_NEVER,
finishPrimaryWithSecondary ? SplitRule.FinishBehavior.ALWAYS
: SplitRule.FinishBehavior.NEVER,
finishSecondaryWithPrimary ? SplitRule.FinishBehavior.ALWAYS
: SplitRule.FinishBehavior.NEVER,
clearTop);
registerTwoPanePairRule(
@@ -155,8 +168,10 @@ public class ActivityEmbeddingRulesController {
new ComponentName(context, DeepLinkHomepageActivityInternal.class),
secondaryComponent,
secondaryIntentAction,
finishPrimaryWithSecondary ? SplitRule.FINISH_ALWAYS : SplitRule.FINISH_NEVER,
finishSecondaryWithPrimary ? SplitRule.FINISH_ALWAYS : SplitRule.FINISH_NEVER,
finishPrimaryWithSecondary ? SplitRule.FinishBehavior.ALWAYS
: SplitRule.FinishBehavior.NEVER,
finishSecondaryWithPrimary ? SplitRule.FinishBehavior.ALWAYS
: SplitRule.FinishBehavior.NEVER,
clearTop);
}
@@ -207,17 +222,20 @@ public class ActivityEmbeddingRulesController {
final Intent intent = new Intent(mContext, Settings.NetworkDashboardActivity.class);
intent.putExtra(SettingsActivity.EXTRA_IS_SECOND_LAYER_PAGE, true);
final SplitPlaceholderRule placeholderRule = new SplitPlaceholderRule(
activityFilters,
intent,
false /* stickyPlaceholder */,
SplitRule.FINISH_ADJACENT,
ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(mContext),
ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthPx(mContext),
ActivityEmbeddingUtils.getSplitRatio(mContext),
LayoutDirection.LOCALE);
SplitAttributes attributes = new SplitAttributes.Builder()
.setSplitType(SplitAttributes.SplitType.ratio(
ActivityEmbeddingUtils.getSplitRatio(mContext)))
.build();
final SplitPlaceholderRule placeholderRule = new SplitPlaceholderRule.Builder(
activityFilters, intent)
.setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp())
.setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())
.setSticky(false)
.setFinishPrimaryWithPlaceholder(SplitRule.FinishBehavior.ADJACENT)
.setDefaultSplitAttributes(attributes)
.build();
mSplitController.registerRule(placeholderRule);
mSplitController.addRule(placeholderRule);
}
private void registerAlwaysExpandRule() {
@@ -235,14 +253,16 @@ public class ActivityEmbeddingRulesController {
addActivityFilter(activityFilters, FaceEnrollIntroduction.class);
addActivityFilter(activityFilters, AvatarPickerActivity.class);
addActivityFilter(activityFilters, ChooseLockPattern.class);
mSplitController.registerRule(new ActivityRule(activityFilters, true /* alwaysExpand */));
ActivityRule activityRule = new ActivityRule.Builder(activityFilters).setAlwaysExpand(true)
.build();
mSplitController.addRule(activityRule);
}
private static void addActivityFilter(Set<ActivityFilter> activityFilters, Intent intent) {
activityFilters.add(new ActivityFilter(COMPONENT_NAME_WILDCARD, intent.getAction()));
}
private void addActivityFilter(Set<ActivityFilter> activityFilters,
private void addActivityFilter(Collection<ActivityFilter> activityFilters,
Class<? extends Activity> activityClass) {
activityFilters.add(new ActivityFilter(new ComponentName(mContext, activityClass),
null /* intentAction */));