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

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

Merge "Add settings page for notification channel groups"

parents 100e8a38 0c3f4bce

AndroidManifest.xml

+16 −0
Original line number Diff line number Diff line
@@ -2700,6 +2700,22 @@ 
                android:value="com.android.settings.notification.AppNotificationSettings" />

        </activity>



        <!-- Show channel group-level notification settings (group passed in as extras) -->

        <activity android:name="Settings$ChannelGroupNotificationSettingsActivity"

                  android:exported="true">

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

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

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

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

        </activity>





        <!-- Show channel-level notification settings (channel passed in as extras) -->

        <activity android:name="Settings$ChannelNotificationSettingsActivity"

                  android:exported="true">

res/values/strings.xml

+12 −0
Original line number Diff line number Diff line
@@ -6836,6 +6836,9 @@ 
    <!-- [CHAR LIMIT=100] Notification channel title -->

    <string name="notification_channel_title">Notification category</string>









    <!-- [CHAR LIMIT=200] Notification channel group title -->









    <string name="notification_group_title">Notification category group</string>

















    <!-- [CHAR LIMIT=100] Notification importance screen title -->









    <string name="notification_importance_title">Importance</string>
















@@ -7003,12 +7006,21 @@







    <!-- [CHAR LIMIT=NONE] Text appearing when channel notifications are off -->









    <string name="channel_notifications_off_desc">Android is blocking this category of notifications from appearing on this device</string>

















    <!-- [CHAR LIMIT=NONE] Text appearing when channel group notifications are off -->









    <string name="channel_group_notifications_off_desc">Android is blocking this group of notifications from appearing on this device</string>

















    <!-- [CHAR LIMIT=NONE] App notification settings: channels title -->









    <string name="notification_channels">Categories</string>

















    <!-- [CHAR LIMIT=NONE] App notification settings: non-grouped-channels title -->









    <string name="notification_channels_other">Other</string>

















    <!-- [CHAR LIMIT=45] App notification settings, group summary-->









    <plurals name="notification_group_summary">









        <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> category</item>









        <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> categories</item>









    </plurals>

















    <!-- [CHAR LIMIT=NONE] App notification settings: no channels -->









    <string name="no_channels">This app has not posted any notifications</string>

































res/xml/upgraded_channel_notification_settings.xml



+1
−0






























Original line number
Diff line number
Diff line







@@ -38,6 +38,7 @@







        settings:useAdditionalSummary="true" />



















    <PreferenceCategory









        android:key="advanced"









        android:title="@string/advanced_apps">



















        <!-- Visibility Override -->
































src/com/android/settings/Settings.java



+1
−0






























Original line number
Diff line number
Diff line







@@ -124,6 +124,7 @@ public class Settings extends SettingsActivity {







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









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









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









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









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









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









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
































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



+2
−0






























Original line number
Diff line number
Diff line







@@ -100,6 +100,7 @@ import com.android.settings.nfc.AndroidBeam;







import com.android.settings.nfc.PaymentSettings;









import com.android.settings.notification.AppNotificationSettings;









import com.android.settings.notification.ChannelNotificationSettings;









import com.android.settings.notification.ChannelGroupNotificationSettings;









import com.android.settings.notification.ConfigureNotificationSettings;









import com.android.settings.notification.NotificationAccessSettings;









import com.android.settings.notification.NotificationStation;








@@ -209,6 +210,7 @@ public class SettingsGateway {







            BatterySaverSettings.class.getName(),









            AppNotificationSettings.class.getName(),









            ChannelNotificationSettings.class.getName(),









            ChannelGroupNotificationSettings.class.getName(),









            ApnSettings.class.getName(),









            ApnEditor.class.getName(),









            WifiCallingSettings.class.getName(),