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

Merge "Notifications settings updates to match spec: - change badge language & remove summary - change caps on sound text" into oc-dev

Browse Source
This commit is contained in:
Alison Cichowlas
2017-05-10 18:42:52 +00:00
committed by Android (Google) Code Review
parent 154824f124 28543f82f9
commit b9a2d6a6e3
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/values/strings.xml
View File

@@ -6600,8 +6600,8 @@
<!-- [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>
<!-- [CHAR LIMIT=40 BACKUP_MESSAGE_ID:6585849855452076626] Notification importance title -->
<string name="allow_sound">Allow sound</string>
<!-- [CHAR LIMIT=180] Notification importance summary -->
<string name="show_silently_summary">Don\'t make sound, vibrate, or peek these notifications into view on the current screen.</string>
@@ -6760,11 +6760,8 @@
<!-- [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] Channel notification settings: Badging option title -->
<string name="notification_badge_title">Badge app icon</string>
<!-- [CHAR LIMIT=NONE] Channel notification settings: Badge option description-->
<string name="notification_badge_summary">Show notifications as badges on the Home app, if supported.</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] App notification settings: Override DND option title -->
<string name="app_notification_override_dnd_title">Override Do Not Disturb</string>

1
res/xml/app_notification_settings.xml
View File

@@ -23,7 +23,6 @@
<com.android.settingslib.RestrictedSwitchPreference
android:key="badge"
android:title="@string/notification_badge_title"
android:summary="@string/notification_badge_summary"
settings:useAdditionalSummary="true"
settings:restrictedSwitchSummary="@string/enabled_by_admin" />

1
res/xml/channel_notification_settings.xml
View File

@@ -41,7 +41,6 @@
<com.android.settingslib.RestrictedSwitchPreference
android:key="badge"
android:title="@string/notification_badge_title"
android:summary="@string/notification_badge_summary"
settings:useAdditionalSummary="true"
settings:restrictedSwitchSummary="@string/enabled_by_admin" />