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

Merge "System gets its own dnd toggle" into pi-dev

Browse Source 
am: 1e9268b52e

Change-Id: I7d697d483791a30a8c6ad966dad760bcc00e02f3
This commit is contained in:
Beverly
2018-03-07 16:53:44 +00:00
committed by android-build-merger
parent 286caf5a4d 1e9268b52e
commit a6b969b934
9 changed files with 253 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -7549,10 +7549,10 @@
<string name="zen_mode_alarms">Alarms</string>
<!-- [CHAR LIMIT=50] Zen mode settings: Media option -->
<string name="zen_mode_media_system_other">Media</string>
<string name="zen_mode_media">Media</string>
<!-- [CHAR LIMIT=120] Zen mode settings: Media secondary text explaining sounds include system feedback such as system tapping sounds, haptic feedback, etc. -->
<string name="zen_mode_media_system_other_secondary_text">Includes system feedback like touch and charging sounds</string>
<!-- [CHAR LIMIT=50] Zen mode settings: System option which includes sounds such as touch and charging sounds -->
<string name="zen_mode_system">Touch and charging sounds</string>
<!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
<string name="zen_mode_reminders">Reminders</string>

10
res/xml/zen_mode_behavior_settings.xml
View File

@@ -20,7 +20,7 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="zen_mode_behavior_settings_page"
android:title="@string/zen_mode_behavior_settings_title"
settings:initialExpandedChildrenCount="7">
settings:initialExpandedChildrenCount="8">
<PreferenceCategory
android:title="@string/zen_mode_behavior_allow_title"
@@ -34,8 +34,12 @@
<!-- Media -->
<SwitchPreference
android:key="zen_mode_media"
android:title="@string/zen_mode_media_system_other"
android:summary="@string/zen_mode_media_system_other_secondary_text"/>
android:title="@string/zen_mode_media"/>
<!-- System -->
<SwitchPreference
android:key="zen_mode_system"
android:title="@string/zen_mode_system"/>
<!-- Reminders -->
<SwitchPreference