Snap for 12369952 from 1e733f017742ee4dda6db4ff43a44ebe02d864c6 to 24Q4-release (0a403f7a) · Commits · e / os / android_packages_apps_Settings

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

+9 −15

Original line number	Diff line number	Diff line
		@@ -55,7 +55,6 @@ import com.android.settingslib.core.AbstractPreferenceController;
		import com.android.settingslib.core.lifecycle.Lifecycle;
		import com.android.settingslib.drawer.DashboardCategory;
		import com.android.settingslib.drawer.Tile;
		import com.android.settingslib.metadata.PreferenceScreenRegistry;
		import com.android.settingslib.search.Indexable;

		import java.util.ArrayList;
		@@ -101,8 +100,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
		mDashboardFeatureProvider =
		FeatureFactory.getFeatureFactory().getDashboardFeatureProvider();

		if (!usePreferenceScreenMetadata() \|\| PreferenceScreenRegistry.INSTANCE.get(
		getPreferenceScreenBindingKey(context)) == null) {
		if (!isCatalystEnabled()) {
		// Load preference controllers from code
		final List<AbstractPreferenceController> controllersFromCode =
		createPreferenceControllers(context);
		@@ -378,7 +376,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
		return;
		}
		PreferenceScreen screen;
		if (usePreferenceScreenMetadata()) {
		if (isCatalystEnabled()) {
		screen = createPreferenceScreen();
		setPreferenceScreen(screen);
		requireActivity().setTitle(screen.getTitle());
		@@ -390,18 +388,14 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
		displayResourceTilesToScreen(screen);
		}

		@Override
		protected final boolean usePreferenceScreenMetadata() {
		return settingsCatalyst() && enableCatalyst();
		}

		/**
		* Returns if settings catalyst should be enabled (e.g. check trunk stable flag) on current
		* screen.
		*/
		protected boolean enableCatalyst() {
		/** Returns if catalyst is enabled on current screen. */
		protected final boolean isCatalystEnabled() {
		if (!settingsCatalyst()) {
		return false;
		}
		Context context = getContext();
		return context != null ? getPreferenceScreenCreator(context) != null : false;
		}

		/**
		* Perform {@link AbstractPreferenceController#displayPreference(PreferenceScreen)}

src/com/android/settings/datausage/DataUsageSummary.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -180,14 +180,16 @@ public class DataUsageSummary extends DashboardFragment {
		void addWifiSection() {
		TemplatePreferenceCategory category = (TemplatePreferenceCategory)
		inflatePreferences(R.xml.data_usage_wifi);
		category.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build(), 0);
		category.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build(),
		SubscriptionManager.INVALID_SUBSCRIPTION_ID);
		}

		private void addEthernetSection() {
		TemplatePreferenceCategory category = (TemplatePreferenceCategory)
		inflatePreferences(R.xml.data_usage_ethernet);
		category.setTemplate(
		new NetworkTemplate.Builder(NetworkTemplate.MATCH_ETHERNET).build(), 0);
		new NetworkTemplate.Builder(NetworkTemplate.MATCH_ETHERNET).build(),
		SubscriptionManager.INVALID_SUBSCRIPTION_ID);
		}

		private Preference inflatePreferences(int resId) {