Fix build for jetpack update
Fix build for jetpack update
Bug: 265818545
Test: build
Change-Id: If48e7338ee560d995cb8bff7b5348ab36c457836
Merged-In: If48e7338ee560d995cb8bff7b5348ab36c457836
(cherry picked from commit e65283de6a2b2008b7c7202dbeb213b4e6289bb2)
diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
index d789ce8..dafa168 100644
--- a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
+++ b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
@@ -26,8 +26,8 @@
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;
@@ -60,11 +60,11 @@
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);
}
/**
@@ -76,7 +76,7 @@
return;
}
- mSplitController.clearRegisteredRules();
+ mRuleController.clearRules();
// Set a placeholder for home page.
registerHomepagePlaceholderRule();
@@ -112,7 +112,7 @@
.setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())
.setDefaultSplitAttributes(attributes)
.build();
- SplitController.getInstance(context).addRule(splitPairRule);
+ RuleController.getInstance(context).addRule(splitPairRule);
}
/**
@@ -235,7 +235,7 @@
.setDefaultSplitAttributes(attributes)
.build();
- mSplitController.addRule(placeholderRule);
+ mRuleController.addRule(placeholderRule);
}
private void registerAlwaysExpandRule() {
@@ -255,7 +255,7 @@
addActivityFilter(activityFilters, ChooseLockPattern.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) {
diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java
index 67bbcb8..b27f5cc 100644
--- a/src/com/android/settings/homepage/SettingsHomepageActivity.java
+++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -56,6 +56,7 @@
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
+import androidx.window.embedding.ActivityEmbeddingController;
import androidx.window.embedding.SplitController;
import androidx.window.embedding.SplitRule;
@@ -102,7 +103,7 @@
private View mTwoPaneSuggestionView;
private CategoryMixin mCategoryMixin;
private Set<HomepageLoadedListener> mLoadedListeners;
- private SplitController mSplitController;
+ private ActivityEmbeddingController mActivityEmbeddingController;
private boolean mIsEmbeddingActivityEnabled;
private boolean mIsTwoPane;
// A regular layout shows icons on homepage, whereas a simplified layout doesn't.
@@ -190,8 +191,8 @@
setupEdgeToEdge();
setContentView(R.layout.settings_homepage_container);
- mSplitController = SplitController.getInstance(this);
- mIsTwoPane = mSplitController.isActivityEmbedded(this);
+ mActivityEmbeddingController = ActivityEmbeddingController.getInstance(this);
+ mIsTwoPane = mActivityEmbeddingController.isActivityEmbedded(this);
updateAppBarMinHeight();
initHomepageContainer();
@@ -266,7 +267,7 @@
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
- final boolean newTwoPaneState = mSplitController.isActivityEmbedded(this);
+ final boolean newTwoPaneState = mActivityEmbeddingController.isActivityEmbedded(this);
if (mIsTwoPane != newTwoPaneState) {
mIsTwoPane = newTwoPaneState;
updateHomepageAppBar();
diff --git a/src/com/android/settings/homepage/TopLevelSettings.java b/src/com/android/settings/homepage/TopLevelSettings.java
index ba1228a..af553d6 100644
--- a/src/com/android/settings/homepage/TopLevelSettings.java
+++ b/src/com/android/settings/homepage/TopLevelSettings.java
@@ -35,7 +35,7 @@
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
import androidx.recyclerview.widget.RecyclerView;
-import androidx.window.embedding.SplitController;
+import androidx.window.embedding.ActivityEmbeddingController;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -65,7 +65,7 @@
private int mPaddingHorizontal;
private boolean mScrollNeeded = true;
private boolean mFirstStarted = true;
- private SplitController mSplitController;
+ private ActivityEmbeddingController mActivityEmbeddingController;
public TopLevelSettings() {
final Bundle args = new Bundle();
@@ -155,12 +155,12 @@
}
}
- /** Wrap SplitController#isActivityEmbedded for testing. */
+ /** Wrap ActivityEmbeddingController#isActivityEmbedded for testing. */
public boolean isActivityEmbedded() {
- if (mSplitController == null) {
- mSplitController = SplitController.getInstance(getActivity());
+ if (mActivityEmbeddingController == null) {
+ mActivityEmbeddingController = ActivityEmbeddingController.getInstance(getActivity());
}
- return mSplitController.isActivityEmbedded(getActivity());
+ return mActivityEmbeddingController.isActivityEmbedded(getActivity());
}
@Override
diff --git a/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java b/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
index c08f794..8084a48 100644
--- a/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
+++ b/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
@@ -30,7 +30,7 @@
import androidx.preference.PreferenceGroupAdapter;
import androidx.preference.PreferenceViewHolder;
import androidx.recyclerview.widget.RecyclerView;
-import androidx.window.embedding.SplitController;
+import androidx.window.embedding.ActivityEmbeddingController;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -250,6 +250,7 @@
}
private boolean isHighlightNeeded() {
- return SplitController.getInstance(mHomepageActivity).isActivityEmbedded(mHomepageActivity);
+ return ActivityEmbeddingController.getInstance(mHomepageActivity)
+ .isActivityEmbedded(mHomepageActivity);
}
}