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

Commit e230d198 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Make a public activity for zen access details."

parents 6ce76c00 e366f027

AndroidManifest.xml

+13 −0
Original line number Diff line number Diff line
@@ -2389,6 +2389,19 @@ 
                android:value="com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetails" />

        </activity>



        <activity

            android:name="Settings$ZenAccessDetailSettingsActivity"

            android:label="@string/manage_zen_access_title"

            android:excludeFromRecents="true">

            <intent-filter>

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

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

                <data android:scheme="package" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.applications.specialaccess.zenaccess.ZenAccessDetails" />

        </activity>



        <activity

            android:name="Settings$ZenAccessSettingsActivity"

            android:label="@string/manage_zen_access_title"

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ public class Settings extends SettingsActivity { 
    public static class PictureInPictureSettingsActivity extends SettingsActivity { /* empty */ }

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

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

    public static class ZenAccessDetailSettingsActivity extends SettingsActivity {}

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

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

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

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

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSe 
import com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetails;

import com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureSettings;

import com.android.settings.applications.specialaccess.vrlistener.VrListenerSettings;

import com.android.settings.applications.specialaccess.zenaccess.ZenAccessDetails;

import com.android.settings.backup.PrivacySettings;

import com.android.settings.backup.ToggleBackupSettingFragment;

import com.android.settings.backup.UserBackupSettingsActivity;
@@ -209,6 +210,7 @@ public class SettingsGateway { 
            UserSettings.class.getName(),

            NotificationAccessSettings.class.getName(),

            ZenAccessSettings.class.getName(),

            ZenAccessDetails.class.getName(),

            ZenModeAutomationSettings.class.getName(),

            PrintSettingsFragment.class.getName(),

            PrintJobSettingsFragment.class.getName(),