aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--api/cm_current.txt2
-rw-r--r--src/java/cyanogenmod/providers/CMSettings.java19
-rw-r--r--system-api/cm_system-current.txt2
3 files changed, 23 insertions, 0 deletions
diff --git a/api/cm_current.txt b/api/cm_current.txt
index f0a2b1d..7be1743 100644
--- a/api/cm_current.txt
+++ b/api/cm_current.txt
@@ -873,6 +873,8 @@ package cyanogenmod.providers {
field public static final java.lang.String VOLUME_ADJUST_SOUNDS_ENABLED = "volume_adjust_sounds_enabled";
field public static final java.lang.String VOLUME_KEYS_CONTROL_RING_STREAM = "volume_keys_control_ring_stream";
field public static final java.lang.String VOLUME_WAKE_SCREEN = "volume_wake_screen";
+ field public static final java.lang.String ZEN_ALLOW_LIGHTS = "allow_lights";
+ field public static final java.lang.String ZEN_PRIORITY_ALLOW_LIGHTS = "zen_priority_allow_lights";
}
}
diff --git a/src/java/cyanogenmod/providers/CMSettings.java b/src/java/cyanogenmod/providers/CMSettings.java
index 21bea12..dfd60fd 100644
--- a/src/java/cyanogenmod/providers/CMSettings.java
+++ b/src/java/cyanogenmod/providers/CMSettings.java
@@ -812,6 +812,22 @@ public final class CMSettings {
new InclusiveIntegerRangeValidator(0, 3);
/**
+ * Whether the notification light will be allowed when in zen mode during downtime
+ */
+ public static final String ZEN_ALLOW_LIGHTS = "allow_lights";
+
+ /** @hide */
+ public static final Validator ZEN_ALLOW_LIGHTS_VALIDATOR = sBooleanValidator;
+
+ /**
+ * Whether the notification light will be allowed when in zen priority mode during downtime
+ */
+ public static final String ZEN_PRIORITY_ALLOW_LIGHTS = "zen_priority_allow_lights";
+
+ /** @hide */
+ public static final Validator ZEN_PRIORITY_ALLOW_LIGHTS_VALIDATOR = sBooleanValidator;
+
+ /**
* Display style of AM/PM next to clock in status bar
* 0: Normal display (Eclair stock)
* 1: Small display (Froyo stock)
@@ -1838,6 +1854,7 @@ public final class CMSettings {
CMSettings.System.VOLUME_KEYS_CONTROL_RING_STREAM,
CMSettings.System.NAVIGATION_BAR_MENU_ARROW_KEYS,
CMSettings.System.HEADSET_CONNECT_PLAYER,
+ CMSettings.System.ZEN_ALLOW_LIGHTS,
};
/**
@@ -1983,6 +2000,8 @@ public final class CMSettings {
VALIDATORS.put(NOTIFICATION_LIGHT_COLOR_AUTO,
NOTIFICATION_LIGHT_COLOR_AUTO_VALIDATOR);
VALIDATORS.put(HEADSET_CONNECT_PLAYER, HEADSET_CONNECT_PLAYER_VALIDATOR);
+ VALIDATORS.put(ZEN_ALLOW_LIGHTS, ZEN_ALLOW_LIGHTS_VALIDATOR);
+ VALIDATORS.put(ZEN_PRIORITY_ALLOW_LIGHTS, ZEN_PRIORITY_ALLOW_LIGHTS_VALIDATOR);
VALIDATORS.put(__MAGICAL_TEST_PASSING_ENABLER,
__MAGICAL_TEST_PASSING_ENABLER_VALIDATOR);
};
diff --git a/system-api/cm_system-current.txt b/system-api/cm_system-current.txt
index f0a2b1d..7be1743 100644
--- a/system-api/cm_system-current.txt
+++ b/system-api/cm_system-current.txt
@@ -873,6 +873,8 @@ package cyanogenmod.providers {
field public static final java.lang.String VOLUME_ADJUST_SOUNDS_ENABLED = "volume_adjust_sounds_enabled";
field public static final java.lang.String VOLUME_KEYS_CONTROL_RING_STREAM = "volume_keys_control_ring_stream";
field public static final java.lang.String VOLUME_WAKE_SCREEN = "volume_wake_screen";
+ field public static final java.lang.String ZEN_ALLOW_LIGHTS = "allow_lights";
+ field public static final java.lang.String ZEN_PRIORITY_ALLOW_LIGHTS = "zen_priority_allow_lights";
}
}