From 4cadb751c29729b73bcec0df8c7a07ec843df0f3 Mon Sep 17 00:00:00 2001
From: Jacky Wang <jiannan@google.com>
Date: Wed, 22 Jan 2025 11:21:54 +0800
Subject: [PATCH] [Catalyst] Allow using zero screen res in DashboardFragment

Bug: 383568136
Flag: android.app.supervision.flags.enable_supervision_settings_screen
Test: manual
Change-Id: Ic76121821b63aafe799cec6e784bf26bf1328092
---
 src/com/android/settings/dashboard/DashboardFragment.java | 8 ++++----
 .../settings/supervision/SupervisionDashboardFragment.kt  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java
index d163bda8d9f..9acdfaa9ba8 100644
--- a/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/src/com/android/settings/dashboard/DashboardFragment.java
@@ -403,10 +403,6 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
      * Displays resource based tiles.
      */
     private void displayResourceTiles() {
-        final int resId = getPreferenceScreenResId();
-        if (resId <= 0) {
-            return;
-        }
         PreferenceScreen screen;
         PreferenceScreenCreator preferenceScreenCreator = getPreferenceScreenCreator();
         if (preferenceScreenCreator != null) {
@@ -416,6 +412,10 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
             }
             setPreferenceScreen(screen);
         } else {
+            final int resId = getPreferenceScreenResId();
+            if (resId <= 0) {
+                return;
+            }
             addPreferencesFromResource(resId);
             screen = getPreferenceScreen();
         }
diff --git a/src/com/android/settings/supervision/SupervisionDashboardFragment.kt b/src/com/android/settings/supervision/SupervisionDashboardFragment.kt
index 77995055737..9b1b1553f99 100644
--- a/src/com/android/settings/supervision/SupervisionDashboardFragment.kt
+++ b/src/com/android/settings/supervision/SupervisionDashboardFragment.kt
@@ -29,7 +29,7 @@ import com.android.settings.dashboard.DashboardFragment
  */
 class SupervisionDashboardFragment : DashboardFragment() {
 
-    override fun getPreferenceScreenResId() = R.xml.placeholder_preference_screen
+    override fun getPreferenceScreenResId() = 0
 
     override fun getMetricsCategory() = SettingsEnums.SUPERVISION_DASHBOARD