summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/values/cm_strings.xml1
-rw-r--r--res/xml/notification_light_settings.xml6
-rw-r--r--res/xml/zen_mode_priority_settings.xml5
-rw-r--r--src/com/android/settings/notification/ZenModePrioritySettings.java7
4 files changed, 19 insertions, 0 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index abb2b25..7693a28 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -301,6 +301,7 @@
<string name="notification_light_voicemail_title">Voicemail</string>
<string name="notification_light_brightness" translatable="false">@string/brightness</string>
<string name="notification_light_screen_on">Lights with screen on</string>
+ <string name="notification_light_zen_mode">Lights in Do Not Disturb mode</string>
<string name="notification_light_use_multiple_leds">Multiple LEDs</string>
<string name="keywords_lights_brightness_level">dim leds brightness</string>
<string name="notification_light_automagic">Choose colors automatically</string>
diff --git a/res/xml/notification_light_settings.xml b/res/xml/notification_light_settings.xml
index 27ecbb0..2c90039 100644
--- a/res/xml/notification_light_settings.xml
+++ b/res/xml/notification_light_settings.xml
@@ -62,6 +62,12 @@
android:dependency="notification_light_pulse" />
<com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
+ android:key="allow_lights"
+ android:title="@string/notification_light_zen_mode"
+ android:dependency="notification_light_pulse"
+ android:defaultValue="true" />
+
+ <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
android:key="notification_light_pulse_custom_enable"
android:title="@string/notification_light_use_custom"
android:dependency="notification_light_pulse" />
diff --git a/res/xml/zen_mode_priority_settings.xml b/res/xml/zen_mode_priority_settings.xml
index 6e324ce..37ec317 100644
--- a/res/xml/zen_mode_priority_settings.xml
+++ b/res/xml/zen_mode_priority_settings.xml
@@ -57,4 +57,9 @@
android:title="@string/zen_mode_repeat_callers"
android:persistent="false"/>
+ <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
+ android:key="zen_priority_allow_lights"
+ android:title="@string/notification_light_title"
+ android:defaultValue="true" />
+
</PreferenceScreen>
diff --git a/src/com/android/settings/notification/ZenModePrioritySettings.java b/src/com/android/settings/notification/ZenModePrioritySettings.java
index 6e34bf7..e8a8bb1 100644
--- a/src/com/android/settings/notification/ZenModePrioritySettings.java
+++ b/src/com/android/settings/notification/ZenModePrioritySettings.java
@@ -35,6 +35,7 @@ public class ZenModePrioritySettings extends ZenModeSettingsBase implements Inde
private static final String KEY_MESSAGES = "messages";
private static final String KEY_CALLS = "calls";
private static final String KEY_REPEAT_CALLERS = "repeat_callers";
+ private static final String KEY_ALLOW_LIGHTS = "zen_priority_allow_lights";
private static final int SOURCE_NONE = -1;
@@ -145,6 +146,12 @@ public class ZenModePrioritySettings extends ZenModeSettingsBase implements Inde
}
});
+ // Remove of the "Allow notification light" setting if LED is not supported
+ if (!getResources().getBoolean(
+ com.android.internal.R.bool.config_intrusiveNotificationLed)) {
+ root.removePreference(findPreference(KEY_ALLOW_LIGHTS));
+ }
+
updateControls();
}