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

Commit b5bbe16e authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Expose bundle settings ui activity" into main

parents cd8d6c46 2785d0fb

AndroidManifest.xml

+11 −0
Original line number Diff line number Diff line
@@ -2190,6 +2190,17 @@ 
            </intent-filter>

        </activity>



        <activity

            android:name="Settings$NotificationBundlesActivity"

            android:exported="true">

            <intent-filter android:priority="1">

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

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

            </intent-filter>

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

                       android:value="com.android.settings.notification.BundlePreferenceFragment" />

        </activity>



        <activity android:name=".notification.zen.ZenModeVoiceActivity"

                android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"

                android:exported="true"

src/com/android/settings/Settings.java

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

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

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

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

}

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

+2 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ import com.android.settings.notification.ConfigureNotificationSettings; 
import com.android.settings.notification.LockScreenNotificationsPreferencePageFragment;

import com.android.settings.notification.NotificationAccessSettings;

import com.android.settings.notification.NotificationAssistantPicker;

import com.android.settings.notification.BundlePreferenceFragment;

import com.android.settings.notification.PoliteNotificationsPreferenceFragment;

import com.android.settings.notification.SoundSettings;

import com.android.settings.notification.app.AppBubbleNotificationSettings;
@@ -422,6 +423,7 @@ public class SettingsGateway { 
            ContentProtectionPreferenceFragment.class.getName(),

            ToggleScreenMagnificationPreferenceFragment.class.getName(),

            FlashNotificationsPreferenceFragment.class.getName(),

            BundlePreferenceFragment.class.getName(),

    };



    public static final String[] SETTINGS_FOR_RESTRICTED = {