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
This commit is contained in:
Jiaming Liu
2023-02-02 03:49:48 +00:00
committed by Anvesh Renikindi
parent a9394d1796
commit e65283de6a
4 changed files with 21 additions and 19 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.ActivityFilter;
import androidx.window.embedding.ActivityRule; import androidx.window.embedding.ActivityRule;
import androidx.window.embedding.RuleController;
import androidx.window.embedding.SplitAttributes; import androidx.window.embedding.SplitAttributes;
import androidx.window.embedding.SplitController;
import androidx.window.embedding.SplitPairFilter; import androidx.window.embedding.SplitPairFilter;
import androidx.window.embedding.SplitPairRule; import androidx.window.embedding.SplitPairRule;
import androidx.window.embedding.SplitPlaceholderRule; import androidx.window.embedding.SplitPlaceholderRule;
@@ -61,11 +61,11 @@ public class ActivityEmbeddingRulesController {
private static final ComponentName COMPONENT_NAME_WILDCARD = new ComponentName( private static final ComponentName COMPONENT_NAME_WILDCARD = new ComponentName(
"*" /* pkg */, "*" /* cls */); "*" /* pkg */, "*" /* cls */);
private final Context mContext; private final Context mContext;
private final SplitController mSplitController; private final RuleController mRuleController;
public ActivityEmbeddingRulesController(Context context) { public ActivityEmbeddingRulesController(Context context) {
mContext = context; mContext = context;
mSplitController = SplitController.getInstance(context); mRuleController = RuleController.getInstance(context);
} }
/** /**
@@ -77,7 +77,7 @@ public class ActivityEmbeddingRulesController {
return; return;
} }
mSplitController.clearRegisteredRules(); mRuleController.clearRules();
// Set a placeholder for home page. // Set a placeholder for home page.
registerHomepagePlaceholderRule(); registerHomepagePlaceholderRule();
@@ -113,7 +113,7 @@ public class ActivityEmbeddingRulesController {
.setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp()) .setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())
.setDefaultSplitAttributes(attributes) .setDefaultSplitAttributes(attributes)
.build(); .build();
SplitController.getInstance(context).addRule(splitPairRule); RuleController.getInstance(context).addRule(splitPairRule);
} }
/** /**
@@ -236,7 +236,7 @@ public class ActivityEmbeddingRulesController {
.setDefaultSplitAttributes(attributes) .setDefaultSplitAttributes(attributes)
.build(); .build();
mSplitController.addRule(placeholderRule); mRuleController.addRule(placeholderRule);
} }
private void registerAlwaysExpandRule() { private void registerAlwaysExpandRule() {
@@ -257,7 +257,7 @@ public class ActivityEmbeddingRulesController {
addActivityFilter(activityFilters, ChooseLockPattern.class); addActivityFilter(activityFilters, ChooseLockPattern.class);
ActivityRule activityRule = new ActivityRule.Builder(activityFilters).setAlwaysExpand(true) ActivityRule activityRule = new ActivityRule.Builder(activityFilters).setAlwaysExpand(true)
.build(); .build();
mSplitController.addRule(activityRule); mRuleController.addRule(activityRule);
} }
private static void addActivityFilter(Set<ActivityFilter> activityFilters, Intent intent) { private static void addActivityFilter(Set<ActivityFilter> activityFilters, Intent intent) {

9
src/com/android/settings/homepage/SettingsHomepageActivity.java
View File

@@ -56,6 +56,7 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
import androidx.window.embedding.ActivityEmbeddingController;
import androidx.window.embedding.SplitController; import androidx.window.embedding.SplitController;
import androidx.window.embedding.SplitRule; import androidx.window.embedding.SplitRule;
@@ -104,7 +105,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements
private View mTwoPaneSuggestionView; private View mTwoPaneSuggestionView;
private CategoryMixin mCategoryMixin; private CategoryMixin mCategoryMixin;
private Set<HomepageLoadedListener> mLoadedListeners; private Set<HomepageLoadedListener> mLoadedListeners;
private SplitController mSplitController; private ActivityEmbeddingController mActivityEmbeddingController;
private boolean mIsEmbeddingActivityEnabled; private boolean mIsEmbeddingActivityEnabled;
private boolean mIsTwoPane; private boolean mIsTwoPane;
// A regular layout shows icons on homepage, whereas a simplified layout doesn't. // A regular layout shows icons on homepage, whereas a simplified layout doesn't.
@@ -192,8 +193,8 @@ public class SettingsHomepageActivity extends FragmentActivity implements
setupEdgeToEdge(); setupEdgeToEdge();
setContentView(R.layout.settings_homepage_container); setContentView(R.layout.settings_homepage_container);
mSplitController = SplitController.getInstance(this); mActivityEmbeddingController = ActivityEmbeddingController.getInstance(this);
mIsTwoPane = mSplitController.isActivityEmbedded(this); mIsTwoPane = mActivityEmbeddingController.isActivityEmbedded(this);
updateAppBarMinHeight(); updateAppBarMinHeight();
initHomepageContainer(); initHomepageContainer();
@@ -276,7 +277,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements
@Override @Override
public void onConfigurationChanged(Configuration newConfig) { public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig); super.onConfigurationChanged(newConfig);
final boolean newTwoPaneState = mSplitController.isActivityEmbedded(this); final boolean newTwoPaneState = mActivityEmbeddingController.isActivityEmbedded(this);
if (mIsTwoPane != newTwoPaneState) { if (mIsTwoPane != newTwoPaneState) {
mIsTwoPane = newTwoPaneState; mIsTwoPane = newTwoPaneState;
updateHomepageAppBar(); updateHomepageAppBar();

12
src/com/android/settings/homepage/TopLevelSettings.java
View File

@@ -36,7 +36,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import androidx.window.embedding.SplitController; import androidx.window.embedding.ActivityEmbeddingController;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
@@ -66,7 +66,7 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi
private int mPaddingHorizontal; private int mPaddingHorizontal;
private boolean mScrollNeeded = true; private boolean mScrollNeeded = true;
private boolean mFirstStarted = true; private boolean mFirstStarted = true;
private SplitController mSplitController; private ActivityEmbeddingController mActivityEmbeddingController;
public TopLevelSettings() { public TopLevelSettings() {
final Bundle args = new Bundle(); final Bundle args = new Bundle();
@@ -163,13 +163,13 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi
} }
} }
/** Wrap SplitController#isActivityEmbedded for testing. */ /** Wrap ActivityEmbeddingController#isActivityEmbedded for testing. */
@VisibleForTesting @VisibleForTesting
public boolean isActivityEmbedded() { public boolean isActivityEmbedded() {
if (mSplitController == null) { if (mActivityEmbeddingController == null) {
mSplitController = SplitController.getInstance(getActivity()); mActivityEmbeddingController = ActivityEmbeddingController.getInstance(getActivity());
} }
return mSplitController.isActivityEmbedded(getActivity()); return mActivityEmbeddingController.isActivityEmbedded(getActivity());
} }
@Override @Override

5
src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
View File

@@ -30,7 +30,7 @@ import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceGroupAdapter; import androidx.preference.PreferenceGroupAdapter;
import androidx.preference.PreferenceViewHolder; import androidx.preference.PreferenceViewHolder;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import androidx.window.embedding.SplitController; import androidx.window.embedding.ActivityEmbeddingController;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
@@ -250,6 +250,7 @@ public class HighlightableTopLevelPreferenceAdapter extends PreferenceGroupAdapt
} }
private boolean isHighlightNeeded() { private boolean isHighlightNeeded() {
return SplitController.getInstance(mHomepageActivity).isActivityEmbedded(mHomepageActivity); return ActivityEmbeddingController.getInstance(mHomepageActivity)
.isActivityEmbedded(mHomepageActivity);
} }
} }