PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-11-26 21:39:16 +00:00
committed by Android (Google) Code Review
parent 6d2a678b67 c94da8b7ce
commit 164d2c943e
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/zen_mode_settings.xml
View File

@@ -37,11 +37,6 @@
android:title="@string/zen_mode_messages_title" android:title="@string/zen_mode_messages_title"
android:fragment="com.android.settings.notification.ZenModeMessagesSettings" /> android:fragment="com.android.settings.notification.ZenModeMessagesSettings" />
<!-- Alarms -->
<SwitchPreference
android:key="zen_mode_behavior_alarms"
android:title="@string/zen_mode_alarms"/>
<!-- All sounds --> <!-- All sounds -->
<Preference <Preference
android:key="zen_sound_vibration_settings" android:key="zen_sound_vibration_settings"

2
src/com/android/settings/notification/ZenModeSettings.java
View File

@@ -86,8 +86,6 @@ public class ZenModeSettings extends ZenModeSettingsBase {
"zen_mode_behavior_calls")); "zen_mode_behavior_calls"));
controllers.add(new ZenModeMessagesPreferenceController(context, lifecycle, controllers.add(new ZenModeMessagesPreferenceController(context, lifecycle,
"zen_mode_behavior_messages")); "zen_mode_behavior_messages"));
controllers.add(new ZenModeAlarmsPreferenceController(context, lifecycle,
"zen_mode_behavior_alarms"));
controllers.add(new ZenModeBlockedEffectsPreferenceController(context, lifecycle)); controllers.add(new ZenModeBlockedEffectsPreferenceController(context, lifecycle));
controllers.add(new ZenModeDurationPreferenceController(context, lifecycle)); controllers.add(new ZenModeDurationPreferenceController(context, lifecycle));
controllers.add(new ZenModeAutomationPreferenceController(context)); controllers.add(new ZenModeAutomationPreferenceController(context));