commit 813d923c2a1ca7152cbc5bb6a2f667742f6e8db7
author Yuri Lin <yurilin@google.com> Wed Aug 11 14:46:19 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 11 14:46:19 2021 +0000
tree 1d465d1f6fa39ddb12334ef8245c43669dee016d
parent daf3d8935942187826a4bf9363ea00ce997731b3
parent 22a4fc040f08f8952bd2a825906b32f0415a924e

Merge "Move automatic rules ("Schedules") into general DND category."

res/xml/zen_mode_settings.xml

diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index f5589de..0629bdb 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -52,19 +52,15 @@
             android:fragment="com.android.settings.notification.zen.ZenModeSoundVibrationSettings" />
     </PreferenceCategory>
 
-    <!-- Automatic rules -->
     <PreferenceCategory
-        android:key="zen_mode_settings_schedule"
-        android:title="@string/zen_category_schedule">
+        android:title="@string/zen_settings_general"
+        android:key="zen_mode_settings_advanced">
+
+        <!-- Automatic rules -->
         <Preference
             android:key="zen_mode_automation_settings"
             android:title="@string/zen_category_schedule"
             android:fragment="com.android.settings.notification.zen.ZenModeAutomationSettings"/>
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:title="@string/zen_settings_general"
-        android:key="zen_mode_settings_advanced">
 
         <!-- DND duration settings -->
         <com.android.settings.notification.zen.ZenDurationDialogPreference