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

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

Merge "Add settings for notification bubbling"

parents 82ebf609 0c45775a

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -7621,6 +7621,9 @@ 
    <!-- Configure Notifications: Title for the notification badging option. [CHAR LIMIT=30 BACKUP_MESSAGE_ID=5125022693565388760] -->

    <string name="notification_badging_title">Allow notification dots</string>









    <!-- Configure Notifications: Title for the notification bubbles option. [CHAR LIMIT=60] -->









    <string name="notification_bubbles_title">Allow notification bubbles</string>

















    <!-- Configure Notifications: Title for the pulse notification light option. [CHAR LIMIT=30] -->









    <string name="notification_pulse_title">Blink light</string>

































res/xml/app_notification_settings.xml



+6
−1






























Original line number
Diff line number
Diff line







@@ -60,9 +60,14 @@







            settings:useAdditionalSummary="true"









            android:order="1001"









            settings:restrictedSwitchSummary="@string/enabled_by_admin" />









        <com.android.settingslib.RestrictedSwitchPreference









            android:key="bubble"









            android:title="@string/notification_bubbles_title"









            android:order="1002"









            settings:restrictedSwitchSummary="@string/enabled_by_admin" />









        <Preference









            android:key="app_link"









            android:order="1002"









            android:order="1003"









            android:title="@string/app_settings_link" />



















    </PreferenceCategory>
































res/xml/channel_notification_settings.xml



+8
−2






























Original line number
Diff line number
Diff line







@@ -86,17 +86,23 @@







            settings:useAdditionalSummary="true"









            settings:restrictedSwitchSummary="@string/enabled_by_admin"/>



















        <com.android.settingslib.RestrictedSwitchPreference









            android:key="bubble"









            android:title="@string/notification_bubbles_title"









            android:order="16"









            settings:restrictedSwitchSummary="@string/enabled_by_admin" />



















        <!-- Bypass DND -->









        <com.android.settingslib.RestrictedSwitchPreference









            android:key="bypass_dnd"









            android:order="16"









            android:order="17"









            android:title="@string/app_notification_override_dnd_title"









            android:summary="@string/app_notification_override_dnd_summary"









            settings:useAdditionalSummary="true"/>



















        <Preference









            android:key="app_link"









            android:order="17"









            android:order="18"









            android:title="@string/app_settings_link"









            settings:allowDividerAbove="true"/>









    </PreferenceCategory>
































res/xml/configure_notification_settings.xml



+6
−0






























Original line number
Diff line number
Diff line







@@ -38,6 +38,12 @@







        android:title="@string/notification_badging_title"









        settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>



















    <!-- Notification bubbles -->









    <SwitchPreference









        android:key="notification_bubbles"









        android:title="@string/notification_bubbles_title"









        settings:controller="com.android.settings.notification.BubbleNotificationPreferenceController"/>



















    <!-- Pulse notification light -->









    <SwitchPreference









        android:key="notification_pulse"
































src/com/android/settings/notification/AppNotificationSettings.java



+1
−0






























Original line number
Diff line number
Diff line







@@ -152,6 +152,7 @@ public class AppNotificationSettings extends NotificationSettingsBase {







        mControllers.add(new DescriptionPreferenceController(context));









        mControllers.add(new NotificationsOffPreferenceController(context));









        mControllers.add(new DeletedChannelsPreferenceController(context, mBackend));









        mControllers.add(new BubblePreferenceController(context, mBackend));









        return new ArrayList<>(mControllers);









    }