PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 12369952 from 1e733f0177 to 24Q4-release

Browse Source 
Change-Id: Ib64188a1c39a457f9bd684854117879d85aaf757
This commit is contained in:
Android Build Coastguard Worker
2024-09-14 22:56:32 +00:00
parent ba863ca150 1e733f0177
commit 0a403f7af7
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/android/settings/dashboard/DashboardFragment.java
View File

@@ -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,17 +388,13 @@ 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() {
return false;
/** 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;
}
/**

6
src/com/android/settings/datausage/DataUsageSummary.java
View File

@@ -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) {