PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "App & channel notification settings updates" into oc-dev am: 8e305ee536

Browse Source 
am: afebbacc12

Change-Id: I2273c52047bce301f6f5fca906fa1d52428a4929
This commit is contained in:
Julia Reynolds
2017-04-27 15:30:57 +00:00
committed by android-build-merger
parent d8abc679fc afebbacc12
commit c7ea0f961b
12 changed files with 489 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
res/values/strings.xml
View File

@@ -6566,7 +6566,10 @@
<!-- Notification Settings: Title for the option managing notifications per application. [CHAR LIMIT=30] -->
<string name="app_notifications_title">Notifications</string>
<!-- [CHAR LIMIT=100] Notification importance slider title -->
<!-- [CHAR LIMIT=100] Notification channel title -->
<string name="notification_channel_title">Notification category</string>
<!-- [CHAR LIMIT=100] Notification importance screen title -->
<string name="notification_importance_title">Importance</string>
<!-- [CHAR LIMIT=100] Notification Importance: unspecified importance level description -->
@@ -6587,17 +6590,17 @@
<!-- [CHAR LIMIT=100] Notification Importance: high importance level description -->
<string name="notification_importance_high">Make sound and pop on screen</string>
<!-- [CHAR LIMIT=100] Notification Importance summary: min importance level description -->
<string name="notification_importance_min_summary">Low: No sound or visual interruption</string>
<!-- [CHAR LIMIT=100] Notification Importance title: min importance level title -->
<string name="notification_importance_min_title">Low</string>
<!-- [CHAR LIMIT=100] Notification Importance summary: low importance level description -->
<string name="notification_importance_low_summary">Medium: No sound</string>
<!-- [CHAR LIMIT=100] Notification Importance title: low importance level title -->
<string name="notification_importance_low_title">Medium</string>
<!-- [CHAR LIMIT=100] Notification Importance summary: normal importance level description -->
<string name="notification_importance_default_summary">High: Make sound</string>
<!-- [CHAR LIMIT=100] Notification Importance title: normal importance level title -->
<string name="notification_importance_default_title">High</string>
<!-- [CHAR LIMIT=100] Notification Importance summary: high importance level description -->
<string name="notification_importance_high_summary">Urgent: Make sound and pop on screen</string>
<!-- [CHAR LIMIT=100] Notification Importance title: high importance level title -->
<string name="notification_importance_high_title">Urgent</string>
<!-- [CHAR LIMIT=40] Notification importance title -->
<string name="allow_sound">Allow Sound</string>
@@ -6706,6 +6709,12 @@
<!-- [CHAR LIMIT=NONE] Text when loading app list in notification settings -->
<string name="loading_notification_apps">Loading apps...</string>
<!-- [CHAR LIMIT=NONE] Text appearing when app notifications are off -->
<string name="app_notifications_off_desc">Android is blocking this app\'s notifications from appearing on this device</string>
<!-- [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] App notification settings: channels title -->
<string name="notification_channels">Categories</string>