Merge "Dynamic Injection into PreferenceCategory" into main (e15ae758) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/dashboard/DashboardFragment.java

+7 −3

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