Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Catalyst] Allow using zero screen res in DashboardFragment

Browse Source 
Bug: 383568136
Flag: android.app.supervision.flags.enable_supervision_settings_screen
Test: manual
Change-Id: Ic76121821b63aafe799cec6e784bf26bf1328092
This commit is contained in:
Jacky Wang
2025-01-22 11:21:54 +08:00
parent aa39f81625
commit 4cadb751c2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -403,10 +403,6 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
* Displays resource based tiles. * Displays resource based tiles.
*/ */
private void displayResourceTiles() { private void displayResourceTiles() {
final int resId = getPreferenceScreenResId();
if (resId <= 0) {
return;
}
PreferenceScreen screen; PreferenceScreen screen;
PreferenceScreenCreator preferenceScreenCreator = getPreferenceScreenCreator(); PreferenceScreenCreator preferenceScreenCreator = getPreferenceScreenCreator();
if (preferenceScreenCreator != null) { if (preferenceScreenCreator != null) {
@@ -416,6 +412,10 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
} }
setPreferenceScreen(screen); setPreferenceScreen(screen);
} else { } else {
final int resId = getPreferenceScreenResId();
if (resId <= 0) {
return;
}
addPreferencesFromResource(resId); addPreferencesFromResource(resId);
screen = getPreferenceScreen(); screen = getPreferenceScreen();
} }

2
src/com/android/settings/supervision/SupervisionDashboardFragment.kt
View File

@@ -29,7 +29,7 @@ import com.android.settings.dashboard.DashboardFragment
*/ */
class SupervisionDashboardFragment : DashboardFragment() { class SupervisionDashboardFragment : DashboardFragment() {
override fun getPreferenceScreenResId() = R.xml.placeholder_preference_screen override fun getPreferenceScreenResId() = 0
override fun getMetricsCategory() = SettingsEnums.SUPERVISION_DASHBOARD override fun getMetricsCategory() = SettingsEnums.SUPERVISION_DASHBOARD