Merge "Notification settings, importance and pre-O apps" into oc-dev

This commit is contained in:
Julia Reynolds
2017-05-12 12:14:07 +00:00
committed by Android (Google) Code Review
10 changed files with 373 additions and 210 deletions

View File

@@ -6579,6 +6579,12 @@
<!-- [CHAR LIMIT=100] Notification Importance: blocked importance level description -->
<string name="notification_importance_blocked">Never show notifications</string>
<!-- [CHAR LIMIT=100] Notification Importance template for the channel importance summary -->
<string name="notification_importance_divider" translatable="false"><xliff:g id="importance_title">%1$s</xliff:g>: <xliff:g id="importance_summary">%2$s</xliff:g></string>
<!-- Importance title strings for the Importance page. Also the second part of the importance
summary on the channel page-->
<!-- [CHAR LIMIT=100] Notification Importance: min importance level description -->
<string name="notification_importance_min">No sound or visual interruption</string>
@@ -6591,6 +6597,9 @@
<!-- [CHAR LIMIT=100] Notification Importance: high importance level description -->
<string name="notification_importance_high">Make sound and pop on screen</string>
<!-- Importance title strings for the Importance page. Also the first part of the importance
summary on the channel page-->
<!-- [CHAR LIMIT=100] Notification Importance title: min importance level title -->
<string name="notification_importance_min_title">Low</string>