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

Commit 7bebe024 authored by Yvonne Jiang's avatar Yvonne Jiang Committed by Android (Google) Code Review
Browse files

Merge "Expose Supervision dashboard screen for deep links." into main

parents 62fafeb6 d8f456af

AndroidManifest.xml

+18 −0
Original line number Diff line number Diff line
@@ -2899,6 +2899,24 @@ 
            </intent-filter>

        </activity>



        <activity

            android:name=".Settings$SupervisionDashboardActivity"

            android:label="@string/supervision_settings_title"

            android:exported="true"

            android:featureFlag="android.app.supervision.flags.enable_supervision_settings_screen">

            <intent-filter>

                <action android:name="android.settings.SUPERVISION_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>



            <meta-data

                android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.supervision.SupervisionDashboardFragment" />

            <meta-data

                android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                android:value="@string/menu_key_supervision" />

        </activity>



        <activity android:name=".supervision.ConfirmSupervisionCredentialsActivity"

            android:exported="true"

            android:featureFlag="android.app.supervision.flags.supervision_manager_apis">

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -573,4 +573,5 @@ public class Settings extends SettingsActivity { 
    public static class MagnificationActivity extends SettingsActivity { /* empty */ }

    public static class FlashNotificationsActivity extends SettingsActivity { /* empty */ }

    public static class NotificationBundlesActivity extends SettingsActivity { /* empty */ }

    public static class SupervisionDashboardActivity extends SettingsActivity { /* empty */ }

}

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ import com.android.settings.security.SecurityAdvancedSettings; 
import com.android.settings.security.SecuritySettings;

import com.android.settings.shortcut.CreateShortcut;

import com.android.settings.sound.MediaControlsSettings;

import com.android.settings.supervision.SupervisionDashboardFragment;

import com.android.settings.support.SupportDashboardActivity;

import com.android.settings.system.ResetDashboardFragment;

import com.android.settings.system.ShadePanelsFragment;
@@ -432,6 +433,7 @@ public class SettingsGateway { 
            BundlePreferenceFragment.class.getName(),

            SystemLocalePickerFragment.class.getName(),

            AppLocalePickerFragment.class.getName(),

            SupervisionDashboardFragment.class.getName(),

    };



    public static final String[] SETTINGS_FOR_RESTRICTED = {