Loading src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java +7 −7 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -60,11 +60,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); } /** Loading @@ -76,7 +76,7 @@ public class ActivityEmbeddingRulesController { return; } mSplitController.clearRegisteredRules(); mRuleController.clearRules(); // Set a placeholder for home page. registerHomepagePlaceholderRule(); Loading Loading @@ -112,7 +112,7 @@ public class ActivityEmbeddingRulesController { .setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp()) .setDefaultSplitAttributes(attributes) .build(); SplitController.getInstance(context).addRule(splitPairRule); RuleController.getInstance(context).addRule(splitPairRule); } /** Loading Loading @@ -235,7 +235,7 @@ public class ActivityEmbeddingRulesController { .setDefaultSplitAttributes(attributes) .build(); mSplitController.addRule(placeholderRule); mRuleController.addRule(placeholderRule); } private void registerAlwaysExpandRule() { Loading @@ -255,7 +255,7 @@ public class ActivityEmbeddingRulesController { 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) { Loading src/com/android/settings/homepage/SettingsHomepageActivity.java +5 −4 Original line number Diff line number Diff line Loading @@ -56,6 +56,7 @@ import androidx.fragment.app.Fragment; 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; Loading Loading @@ -102,7 +103,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements 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. Loading Loading @@ -190,8 +191,8 @@ public class SettingsHomepageActivity extends FragmentActivity implements 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(); Loading Loading @@ -266,7 +267,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements @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(); Loading src/com/android/settings/homepage/TopLevelSettings.java +6 −6 Original line number Diff line number Diff line Loading @@ -35,7 +35,7 @@ import androidx.preference.Preference; 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; Loading Loading @@ -65,7 +65,7 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi private int mPaddingHorizontal; private boolean mScrollNeeded = true; private boolean mFirstStarted = true; private SplitController mSplitController; private ActivityEmbeddingController mActivityEmbeddingController; public TopLevelSettings() { final Bundle args = new Bundle(); Loading Loading @@ -155,12 +155,12 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi } } /** 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 Loading src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java +3 −2 Original line number Diff line number Diff line Loading @@ -30,7 +30,7 @@ import androidx.preference.PreferenceGroup; 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; Loading Loading @@ -250,6 +250,7 @@ public class HighlightableTopLevelPreferenceAdapter extends PreferenceGroupAdapt } private boolean isHighlightNeeded() { return SplitController.getInstance(mHomepageActivity).isActivityEmbedded(mHomepageActivity); return ActivityEmbeddingController.getInstance(mHomepageActivity) .isActivityEmbedded(mHomepageActivity); } } Loading
src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java +7 −7 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -60,11 +60,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); } /** Loading @@ -76,7 +76,7 @@ public class ActivityEmbeddingRulesController { return; } mSplitController.clearRegisteredRules(); mRuleController.clearRules(); // Set a placeholder for home page. registerHomepagePlaceholderRule(); Loading Loading @@ -112,7 +112,7 @@ public class ActivityEmbeddingRulesController { .setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp()) .setDefaultSplitAttributes(attributes) .build(); SplitController.getInstance(context).addRule(splitPairRule); RuleController.getInstance(context).addRule(splitPairRule); } /** Loading Loading @@ -235,7 +235,7 @@ public class ActivityEmbeddingRulesController { .setDefaultSplitAttributes(attributes) .build(); mSplitController.addRule(placeholderRule); mRuleController.addRule(placeholderRule); } private void registerAlwaysExpandRule() { Loading @@ -255,7 +255,7 @@ public class ActivityEmbeddingRulesController { 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) { Loading
src/com/android/settings/homepage/SettingsHomepageActivity.java +5 −4 Original line number Diff line number Diff line Loading @@ -56,6 +56,7 @@ import androidx.fragment.app.Fragment; 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; Loading Loading @@ -102,7 +103,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements 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. Loading Loading @@ -190,8 +191,8 @@ public class SettingsHomepageActivity extends FragmentActivity implements 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(); Loading Loading @@ -266,7 +267,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements @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(); Loading
src/com/android/settings/homepage/TopLevelSettings.java +6 −6 Original line number Diff line number Diff line Loading @@ -35,7 +35,7 @@ import androidx.preference.Preference; 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; Loading Loading @@ -65,7 +65,7 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi private int mPaddingHorizontal; private boolean mScrollNeeded = true; private boolean mFirstStarted = true; private SplitController mSplitController; private ActivityEmbeddingController mActivityEmbeddingController; public TopLevelSettings() { final Bundle args = new Bundle(); Loading Loading @@ -155,12 +155,12 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi } } /** 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 Loading
src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java +3 −2 Original line number Diff line number Diff line Loading @@ -30,7 +30,7 @@ import androidx.preference.PreferenceGroup; 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; Loading Loading @@ -250,6 +250,7 @@ public class HighlightableTopLevelPreferenceAdapter extends PreferenceGroupAdapt } private boolean isHighlightNeeded() { return SplitController.getInstance(mHomepageActivity).isActivityEmbedded(mHomepageActivity); return ActivityEmbeddingController.getInstance(mHomepageActivity) .isActivityEmbedded(mHomepageActivity); } }