Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 164d2c94 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove "Allow alarms" from top level DND settings"

parents 6d2a678b c94da8b7

res/xml/zen_mode_settings.xml

+0 −5
Original line number Diff line number Diff line
@@ -37,11 +37,6 @@ 
            android:title="@string/zen_mode_messages_title"

            android:fragment="com.android.settings.notification.ZenModeMessagesSettings" />



        <!-- Alarms -->

        <SwitchPreference

            android:key="zen_mode_behavior_alarms"

            android:title="@string/zen_mode_alarms"/>



        <!-- All sounds -->

        <Preference

            android:key="zen_sound_vibration_settings"

src/com/android/settings/notification/ZenModeSettings.java

+0 −2
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ public class ZenModeSettings extends ZenModeSettingsBase { 
                "zen_mode_behavior_calls"));

        controllers.add(new ZenModeMessagesPreferenceController(context, lifecycle,

                "zen_mode_behavior_messages"));

        controllers.add(new ZenModeAlarmsPreferenceController(context, lifecycle,

                "zen_mode_behavior_alarms"));

        controllers.add(new ZenModeBlockedEffectsPreferenceController(context, lifecycle));

        controllers.add(new ZenModeDurationPreferenceController(context, lifecycle));

        controllers.add(new ZenModeAutomationPreferenceController(context));