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

Merge "Notification slider changes." into nyc-dev am: 8b01df5

Browse Source 
am: 29eeaf9

* commit '29eeaf9530fa116f7ad890ed438c4e5de7486dff':
  Notification slider changes.

Change-Id: I6427f467d58cf40a8b6ba3067b0007b6e11a2927
This commit is contained in:
Julia Reynolds
2016-04-15 15:38:32 +00:00
committed by android-build-merger
parent 70d759c131 29eeaf9530
commit 0986daa6cc
8 changed files with 210 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/colors.xml
View File

@@ -125,6 +125,10 @@
<color name="seek_bar_preference_preview_text">#fff</color>
<color name="importance_slider_color">@*android:color/material_deep_teal_500</color>
<color name="importance_disabled_slider_color">@*android:color/material_grey_300</color>
<color name="importance_secondary_slider_color">#858383</color>
<color name="usage_graph_dots">#B0BEC5</color>
</resources>

17
res/values/strings.xml
View File

@@ -5979,22 +5979,25 @@
<string name="notification_importance_none">Not set</string>
<!-- [CHAR LIMIT=100] Notification Importance slider: blocked importance level description -->
<string name="notification_importance_blocked">Blocked: Never show these notifications</string>
<string name="notification_importance_blocked">Never show notifications from this app</string>
<!-- [CHAR LIMIT=100] Notification Importance slider: min importance level description -->
<string name="notification_importance_min">Min: Silently show at the bottom of the notification list</string>
<string name="notification_importance_min">No full screen interruption, peeking, sound, or vibration. Show at the bottom of the notification list. Hide from lock screen and status bar.</string>
<!-- [CHAR LIMIT=100] Notification Importance slider: low importance level description -->
<string name="notification_importance_low">Low: Silently show these notifications</string>
<string name="notification_importance_low">No full screen interruption, peeking, sound, or vibration.</string>
<!-- [CHAR LIMIT=100] Notification Importance slider: normal importance level description -->
<string name="notification_importance_default">Normal: Allow these notification to make sounds</string>
<string name="notification_importance_default">No full screen interruption or peeking.</string>
<!-- [CHAR LIMIT=100] Notification Importance slider: high importance level description -->
<string name="notification_importance_high">High: Peek onto the screen and allow sound</string>
<string name="notification_importance_high">Always peek. No full screen interruption.</string>
<!-- [CHAR LIMIT=100] Notification Importance slider: max importance level description -->
<string name="notification_importance_max">Urgent: Show at the top of the notifications list, peek onto the screen and allow sound</string>
<string name="notification_importance_max">Always peek, and allow full screen interruption. Show at the top of the notification list.</string>
<!-- [CHAR LIMIT=100] Notification Importance slider: max importance level description -->
<string name="notification_importance_unspecified">App determines importance for each notification</string>
<!-- [CHAR LIMIT=60] Notification importance reset button -->
<string name="importance_reset">Reset</string>
@@ -6486,6 +6489,8 @@
<string name="notifications_priority">Do Not Disturb overridden</string>
<!-- App notification summary divider [CHAR LIMIT=40] -->
<string name="notifications_summary_divider">\u00A0/\u00A0</string>
<!-- App notification summary for advanced controls -->
<string name="notification_summary_level">Level %d</string>
<!-- Permissions preference summary [CHAR LIMIT=40] -->
<plurals name="permissions_summary">