Merge "Dynamic Injection into PreferenceCategory" into main

This commit is contained in:
Edgar Wang
2024-04-23 09:00:02 +00:00
committed by Android (Google) Code Review

View File

@@ -545,9 +545,13 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
getActivity(), this, forceRoundedIcons, pref, tile, key,
mPlaceholderPreferenceController.getOrder());
if (Flags.dynamicInjectionCategory()) {
Preference group = screen.findPreference(tile.getGroupKey());
if (tile.hasGroupKey() && group instanceof PreferenceCategory) {
((PreferenceCategory) group).addPreference(pref);
if (tile.hasGroupKey()) {
Preference group = screen.findPreference(tile.getGroupKey());
if (group instanceof PreferenceCategory) {
((PreferenceCategory) group).addPreference(pref);
} else {
screen.addPreference(pref);
}
} else {
screen.addPreference(pref);
}