Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cadb751 authored by Jacky Wang's avatar Jacky Wang
Browse files

[Catalyst] Allow using zero screen res in DashboardFragment 

Bug: 383568136
Flag: android.app.supervision.flags.enable_supervision_settings_screen
Test: manual
Change-Id: Ic76121821b63aafe799cec6e784bf26bf1328092
parent aa39f816

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

+4 −4
Original line number Diff line number Diff line
@@ -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();

        }

src/com/android/settings/supervision/SupervisionDashboardFragment.kt

+1 −1
Original line number Diff line number Diff line
@@ -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