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

Fix build for jetpack update

Browse Source 
Fix build for jetpack update

Bug: 265818545
Test: build

Change-Id: If48e7338ee560d995cb8bff7b5348ab36c457836
Merged-In: If48e7338ee560d995cb8bff7b5348ab36c457836
(cherry picked from commit e65283de6a)
(cherry picked from commit 5a6444776a)
(cherry picked from commit 1c0af48f8c)
This commit is contained in:
Jiaming Liu
2023-02-02 03:49:48 +00:00
committed by Chris Li
parent 585a7f3c7a
commit da7f685695
4 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,8 +26,8 @@ import android.util.Log;
import androidx.window.embedding.ActivityFilter;
import androidx.window.embedding.ActivityRule;
import androidx.window.embedding.RuleController;
import androidx.window.embedding.SplitAttributes;
import androidx.window.embedding.SplitController;
import androidx.window.embedding.SplitPairFilter;
import androidx.window.embedding.SplitPairRule;
import androidx.window.embedding.SplitPlaceholderRule;
@@ -57,11 +57,11 @@ public class ActivityEmbeddingRulesController {
private static final ComponentName COMPONENT_NAME_WILDCARD = new ComponentName(
"*" /* pkg */, "*" /* cls */);
private final Context mContext;
private final SplitController mSplitController;
private final RuleController mRuleController;
public ActivityEmbeddingRulesController(Context context) {
mContext = context;
mSplitController = SplitController.getInstance(context);
mRuleController = RuleController.getInstance(context);
}
/**
@@ -73,7 +73,7 @@ public class ActivityEmbeddingRulesController {
return;
}
mSplitController.clearRegisteredRules();
mRuleController.clearRules();
// Set a placeholder for home page.
registerHomepagePlaceholderRule();
@@ -109,7 +109,7 @@ public class ActivityEmbeddingRulesController {
.setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())
.setDefaultSplitAttributes(attributes)
.build();
SplitController.getInstance(context).addRule(splitPairRule);
RuleController.getInstance(context).addRule(splitPairRule);
}
/**
@@ -232,7 +232,7 @@ public class ActivityEmbeddingRulesController {
.setDefaultSplitAttributes(attributes)
.build();
mSplitController.addRule(placeholderRule);
mRuleController.addRule(placeholderRule);
}
private void registerAlwaysExpandRule() {
@@ -249,7 +249,7 @@ public class ActivityEmbeddingRulesController {
addActivityFilter(activityFilters, AvatarPickerActivity.class);
ActivityRule activityRule = new ActivityRule.Builder(activityFilters).setAlwaysExpand(true)
.build();
mSplitController.addRule(activityRule);
mRuleController.addRule(activityRule);
}
private static void addActivityFilter(Set<ActivityFilter> activityFilters, Intent intent) {