summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorAdrianDC <radian.dc@gmail.com>2016-01-19 12:23:41 +0100
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-01-24 17:46:31 -0800
commit7554a81057aafab96eea1b057b3ada5bade9e9ff (patch)
tree436bf5cb8b44ba30b61c9cd5d4cd21d0955b1faf /res/xml
parentc02cb4d7197f538d9036daef877f36e926a12393 (diff)
downloadpackages_apps_Settings-7554a81057aafab96eea1b057b3ada5bade9e9ff.tar.gz
packages_apps_Settings-7554a81057aafab96eea1b057b3ada5bade9e9ff.tar.bz2
packages_apps_Settings-7554a81057aafab96eea1b057b3ada5bade9e9ff.zip
Settings: Move Do Not Disturb Access under DND settings
Change-Id: I4763577b4cd5aae01705cc693dfaaf06152bd3e6 Signed-off-by: AdrianDC <radian.dc@gmail.com>
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/notification_manager_settings.xml9
-rw-r--r--res/xml/zen_mode_settings.xml9
2 files changed, 10 insertions, 8 deletions
diff --git a/res/xml/notification_manager_settings.xml b/res/xml/notification_manager_settings.xml
index d929e5073..b45cb6bcf 100644
--- a/res/xml/notification_manager_settings.xml
+++ b/res/xml/notification_manager_settings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (C) 2015 The CyanogenMod Project
+ Copyright (C) 2015-2016 The CyanogenMod Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -31,13 +31,6 @@
settings:keywords="@string/keywords_sounds_and_notifications_interruptions"
android:fragment="com.android.settings.notification.ZenModeSettings" />
- <!-- Do Not Disturb access -->
- <Preference
- android:key="manage_zen_access"
- android:title="@string/manage_zen_access_title"
- android:persistent="false"
- android:fragment="com.android.settings.notification.ZenAccessSettings" />
-
<!-- When device is locked -->
<com.android.settings.DropDownPreference
android:key="lock_screen_notifications"
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index 267727f69..258c583da 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2014 The Android Open Source Project
+ Copyright (C) 2016 The CyanogenMod Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -30,4 +31,12 @@
android:key="automation_settings"
android:title="@string/zen_mode_automation_settings_title"
android:fragment="com.android.settings.notification.ZenModeAutomationSettings" />
+
+ <!-- Do Not Disturb access -->
+ <Preference
+ android:key="manage_zen_access"
+ android:title="@string/manage_zen_access_title"
+ android:persistent="false"
+ android:fragment="com.android.settings.notification.ZenAccessSettings" />
+
</PreferenceScreen>