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

This commit is contained in:
Yuri Lin
2021-08-11 14:46:19 +00:00
committed by Android (Google) Code Review

View File

@@ -52,19 +52,15 @@
android:fragment="com.android.settings.notification.zen.ZenModeSoundVibrationSettings" /> android:fragment="com.android.settings.notification.zen.ZenModeSoundVibrationSettings" />
</PreferenceCategory> </PreferenceCategory>
<!-- Automatic rules -->
<PreferenceCategory <PreferenceCategory
android:key="zen_mode_settings_schedule" android:title="@string/zen_settings_general"
android:title="@string/zen_category_schedule"> android:key="zen_mode_settings_advanced">
<!-- Automatic rules -->
<Preference <Preference
android:key="zen_mode_automation_settings" android:key="zen_mode_automation_settings"
android:title="@string/zen_category_schedule" android:title="@string/zen_category_schedule"
android:fragment="com.android.settings.notification.zen.ZenModeAutomationSettings"/> 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 --> <!-- DND duration settings -->
<com.android.settings.notification.zen.ZenDurationDialogPreference <com.android.settings.notification.zen.ZenDurationDialogPreference