commit cbc67a41a0deecce2086837a2950df4845a23741
author Yuri Lin <yurilin@google.com> Thu Mar 17 15:17:31 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 17 15:17:31 2022 +0000
tree 5c2e895a7a46ab6128f7f8373fc84cf84c32c74b
parent 8b096f0400f4e9b84309363c8f0a5d06b6d60767
parent 4d1eb0f3014469cae1b342ee9e6f776bbb9a7584

Merge "Remove preference category in zen mode alarms page" into tm-dev

res/xml/zen_mode_sound_vibration_settings.xml

diff --git a/res/xml/zen_mode_sound_vibration_settings.xml b/res/xml/zen_mode_sound_vibration_settings.xml
index 7410716..2db42ac 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>