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

Commit a974b8c5 authored by Alison Cichowlas's avatar Alison Cichowlas Committed by android-build-merger
Browse files

Merge "Update notification settings to match Notification Dot branding." into oc-dev

am: ed8b39fe

Change-Id: I51475f91a6e2de11c909169ebc5280b1c0e768b5
parents 9e56dd44 ed8b39fe
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -6519,8 +6519,8 @@
    <!-- Configure Notifications: Work profile section header [CHAR LIMIT=30] -->
    <string name="profile_section_header">Work notifications</string>
    <!-- Configure Notifications: Title for the notification badging option. [CHAR LIMIT=30] -->
    <string name="notification_badging_title">Allow icon badges</string>
    <!-- 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 pulse notification light option. [CHAR LIMIT=30] -->
    <string name="notification_pulse_title">Blink light</string>
@@ -6755,9 +6755,6 @@
        <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> categories deleted</item>
    </plurals>
    <!-- [CHAR LIMIT=45\ Global notification badge setting -->
    <string name="notification_badges">Notification badges</string>
    <!-- [CHAR LIMIT=NONE] App notification settings: notifications enabled-->
    <string name="notification_toggle_on">On</string>
@@ -6776,8 +6773,11 @@
    <!-- [CHAR LIMIT=NONE] Channel notification settings: Block option description-->
    <string name="notification_content_block_summary">Never show notifications in the shade or on peripheral devices</string>
    <!-- [CHAR LIMIT=NONE] [BACKUP_MESSAGE_ID:7166470350070693657] Channel notification settings: Badging option title -->
    <string name="notification_badge_title">Allow icon badge</string>
    <!-- [CHAR LIMIT=NONE BACKUP_MESSAGE_ID:7166470350070693657] App notification settings: Badging option title -->
    <string name="notification_badge_title">Allow notification dot</string>
    <!-- [CHAR LIMIT=NONE BACKUP_MESSAGE_ID:7166470350070693657] Channel notification settings: Badging option title -->
    <string name="notification_channel_badge_title">Show notification dot</string>
    <!-- [CHAR LIMIT=NONE] App notification settings: Override DND option title -->
    <string name="app_notification_override_dnd_title">Override Do Not Disturb</string>
+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@
    <!-- Show badge -->
    <com.android.settingslib.RestrictedSwitchPreference
        android:key="badge"
        android:title="@string/notification_badge_title"
        android:title="@string/notification_channel_badge_title"
        settings:useAdditionalSummary="true"
        settings:restrictedSwitchSummary="@string/enabled_by_admin" />