Merge "Clarify "importance" settings for apps not targeting O."

This commit is contained in:
TreeHugger Robot
2017-06-20 19:33:19 +00:00
committed by Android (Google) Code Review
2 changed files with 6 additions and 5 deletions

View File

@@ -6811,11 +6811,11 @@
<!-- [CHAR LIMIT=100] Notification Importance title: high importance level title --> <!-- [CHAR LIMIT=100] Notification Importance title: high importance level title -->
<string name="notification_importance_high_title">Urgent</string> <string name="notification_importance_high_title">Urgent</string>
<!-- [CHAR LIMIT=40 BACKUP_MESSAGE_ID:6585849855452076626] Notification importance title --> <!-- [CHAR LIMIT=40] Notification importance title. This setting controls how notifications in older apps may alert the user (eg, sound, visual, vibrate). -->
<string name="allow_sound">Allow sound</string> <string name="allow_interruption">Allow interruptions</string>
<!-- [CHAR LIMIT=180] Notification importance summary --> <!-- [CHAR LIMIT=180] Notification importance description. More details from allow_interruption string - specifics of how notifications may interrupt. -->
<string name="show_silently_summary">Don\'t make sound, vibrate, or peek these notifications into view on the current screen.</string> <string name="allow_interruption_summary">Let the app make sound, vibrate, and/or pop notifications on screen</string>
<!-- Channel summaries for the app notification page --> <!-- Channel summaries for the app notification page -->

View File

@@ -27,7 +27,8 @@
<!-- Importance toggle --> <!-- Importance toggle -->
<com.android.settingslib.RestrictedSwitchPreference <com.android.settingslib.RestrictedSwitchPreference
android:key="allow_sound" android:key="allow_sound"
android:title="@string/allow_sound" /> android:title="@string/allow_interruption"
android:summary="@string/allow_interruption_summary"/>
<!-- Visibility Override --> <!-- Visibility Override -->
<com.android.settings.notification.RestrictedDropDownPreference <com.android.settings.notification.RestrictedDropDownPreference