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

Commit 48576381 authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge "Bind action to fragment: adaptive notif settings" into main

parents b83151f3 60d3a116

AndroidManifest.xml

+13 −0
Original line number Diff line number Diff line
@@ -1427,6 +1427,19 @@ 
                       android:value="true" />

        </activity>



        <activity

            android:name=".Settings$ManageAdaptiveNotificationsActivity"

            android:exported="true">

            <intent-filter>

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

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

            </intent-filter>

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

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

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

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

        </activity>



        <activity android:name="Settings$WallpaperSettingsActivity"

                  android:label="@string/wallpaper_settings_fragment_title"

                  android:icon="@drawable/ic_wallpaper"

src/com/android/settings/Settings.java

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

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

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

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

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

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

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

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

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

import com.android.settings.notification.NotificationAccessSettings;

import com.android.settings.notification.NotificationAssistantPicker;

import com.android.settings.notification.PoliteNotificationsPreferenceFragment;

import com.android.settings.notification.SoundSettings;

import com.android.settings.notification.app.AppBubbleNotificationSettings;

import com.android.settings.notification.app.AppNotificationSettings;
@@ -314,6 +315,7 @@ public class SettingsGateway { 
            AppInfoDashboardFragment.class.getName(),

            BatterySaverSettings.class.getName(),

            AppNotificationSettings.class.getName(),

            PoliteNotificationsPreferenceFragment.class.getName(),

            NotificationAssistantPicker.class.getName(),

            ChannelNotificationSettings.class.getName(),

            SatelliteSetting.class.getName(),