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

Merge "Update DND strings and image spacing" into rvc-dev am: e1ba740cd8 am: 71f088666a am: 8310f3a01b am: 721e029b0a

Browse Source 
Change-Id: If2c6cf1f704d92be65c875c185336549d8087caa
This commit is contained in:
TreeHugger Robot
2020-04-09 23:34:44 +00:00
committed by Automerger Merge Worker
parent ea2a9f2812 721e029b0a
commit eb2c2aab5d
13 changed files with 58 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/xml/zen_mode_settings.xml
View File

@@ -56,7 +56,6 @@
android:key="zen_mode_automation_settings"
android:title="@string/zen_category_schedule"
settings:allowDividerAbove="true"
settings:allowDividerBelow="true"
android:fragment="com.android.settings.notification.zen.ZenModeAutomationSettings"/>
<PreferenceCategory

11
res/xml/zen_mode_sound_vibration_settings.xml
View File

@@ -26,8 +26,7 @@
<!-- Alarms -->
<SwitchPreference
android:key="zen_mode_alarms"
android:title="@string/zen_mode_alarms"
android:summary="@string/zen_mode_alarms_summary"/>
android:title="@string/zen_mode_alarms"/>
<!-- Media -->
<SwitchPreference
@@ -44,17 +43,13 @@
<!-- Reminders -->
<SwitchPreference
android:key="zen_mode_reminders"
android:title="@string/zen_mode_reminders"
android:summary="@string/zen_mode_reminders_summary"/>
android:title="@string/zen_mode_reminders"/>
<!-- Events -->
<SwitchPreference
android:key="zen_mode_events"
android:title="@string/zen_mode_events"
android:summary="@string/zen_mode_events_summary"/>
android:title="@string/zen_mode_events"/>
</PreferenceCategory>
<com.android.settingslib.widget.FooterPreference/>
</PreferenceScreen>