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

Merge "Replace slider with switches; move slider to tuner." into nyc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2016-02-24 19:44:16 +00:00
committed by Android (Google) Code Review
parent 34ecc000ae d4559a8035
commit c4835dc6e3
4 changed files with 126 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/values/strings.xml
View File

@@ -5955,14 +5955,20 @@
<string name="notification_importance_default">Normal: Silently show these notifications</string>
<!-- [CHAR LIMIT=100] Notification Importance slider: high importance level description -->
<string name="notification_importance_high">High: Show at the top of the notifications list and make sound</string>
<string name="notification_importance_high">High: Show at the top of the notifications list and allow sound</string>
<!-- [CHAR LIMIT=100] Notification Importance slider: max importance level description -->
<string name="notification_importance_max">Urgent: Peek onto the screen and make sound</string>
<string name="notification_importance_max">Urgent: Peek onto the screen and allow sound</string>
<!-- [CHAR LIMIT=60] Notification importance reset button -->
<string name="importance_reset">Reset</string>
<!-- [CHAR LIMIT=40] Notification importance title -->
<string name="show_silently">Show silently</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>
<!-- Default Apps > Default notification assistant -->
<string name="default_notification_assistant">Notification assistant</string>

23
res/xml/app_notification_settings.xml
View File

@@ -19,31 +19,44 @@
android:key="app_notification_settings">
<!-- Importance -->
<!-- Block -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="block"
android:title="@string/app_notification_block_title"
android:summary="@string/app_notification_block_summary"
android:order="2" />
<!-- Silent -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="silent"
android:title="@string/show_silently"
android:summary="@string/show_silently_summary"
android:order="3" />
<!-- Slider -->
<com.android.settingslib.RestrictedPreference
android:key="importance_title"
android:title="@string/notification_importance_title"
android:order="2" />
android:order="4"/>
<com.android.settings.notification.ImportanceSeekBarPreference
android:key="importance"
android:order="3"/>
android:order="5"/>
<com.android.settings.applications.LayoutPreference
android:key="importance_reset_button"
android:layout="@layout/two_buttons_panel"
android:order="4" />
android:order="6" />
<!-- Sensitive -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="sensitive"
android:title="@string/app_notification_sensitive_title"
android:summary="@string/app_notification_sensitive_summary"
android:order="5" />
android:order="7" />
<!-- Bypass DND -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="bypass_dnd"
android:title="@string/app_notification_override_dnd_title"
android:summary="@string/app_notification_override_dnd_summary"
android:order="6" />
android:order="8" />
</PreferenceScreen>