From 22a4fc040f08f8952bd2a825906b32f0415a924e Mon Sep 17 00:00:00 2001
From: Yuri Lin <yurilin@google.com>
Date: Tue, 10 Aug 2021 14:29:49 -0400
Subject: [PATCH] Move automatic rules ("Schedules") into general DND category.

Bug: 183707774
Test: manual
Change-Id: Iaab2f481efc17466d2701c148392684e803d710d
---
 res/xml/zen_mode_settings.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index f5589de6c91..0629bdb5a1a 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