From 4d1eb0f3014469cae1b342ee9e6f776bbb9a7584 Mon Sep 17 00:00:00 2001
From: Yuri Lin <yurilin@google.com>
Date: Wed, 16 Mar 2022 15:02:27 -0400
Subject: [PATCH] Remove preference category in zen mode alarms page

Bug: 223295009
Test: manual
Change-Id: I7afd65519dd2db61d5d39a8e5df085ec71474775
---
 res/xml/zen_mode_sound_vibration_settings.xml | 49 +++++++++----------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/res/xml/zen_mode_sound_vibration_settings.xml b/res/xml/zen_mode_sound_vibration_settings.xml
index 74107168623..2db42ac498e 100644
--- a/res/xml/zen_mode_sound_vibration_settings.xml
+++ b/res/xml/zen_mode_sound_vibration_settings.xml
@@ -19,36 +19,31 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/zen_category_exceptions" >
 
-    <PreferenceCategory
-        android:key="zen_mode_settings_category_sound_vibration">
+    <!-- Alarms -->
+    <SwitchPreference
+        android:key="zen_mode_alarms"
+        android:title="@string/zen_mode_alarms"/>
 
-        <!-- Alarms -->
-        <SwitchPreference
-            android:key="zen_mode_alarms"
-            android:title="@string/zen_mode_alarms"/>
+    <!-- Media -->
+    <SwitchPreference
+        android:key="zen_mode_media"
+        android:title="@string/zen_mode_media"
+        android:summary="@string/zen_mode_media_summary"/>
 
-        <!-- Media -->
-        <SwitchPreference
-            android:key="zen_mode_media"
-            android:title="@string/zen_mode_media"
-            android:summary="@string/zen_mode_media_summary"/>
+    <!-- System -->
+    <SwitchPreference
+        android:key="zen_mode_system"
+        android:title="@string/zen_mode_system"
+        android:summary="@string/zen_mode_system_summary"/>
 
-        <!-- System -->
-        <SwitchPreference
-            android:key="zen_mode_system"
-            android:title="@string/zen_mode_system"
-            android:summary="@string/zen_mode_system_summary"/>
+    <!-- Reminders -->
+    <SwitchPreference
+        android:key="zen_mode_reminders"
+        android:title="@string/zen_mode_reminders"/>
 
-        <!-- Reminders -->
-        <SwitchPreference
-            android:key="zen_mode_reminders"
-            android:title="@string/zen_mode_reminders"/>
-
-        <!-- Events -->
-        <SwitchPreference
-            android:key="zen_mode_events"
-            android:title="@string/zen_mode_events"/>
-
-    </PreferenceCategory>
+    <!-- Events -->
+    <SwitchPreference
+        android:key="zen_mode_events"
+        android:title="@string/zen_mode_events"/>
 
 </PreferenceScreen>