summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/java/android/content/Intent.java7
-rw-r--r--core/java/android/provider/Settings.java8
-rw-r--r--core/res/res/values/cm_symbols.xml9
-rwxr-xr-xcore/res/res/values/config.xml4
-rwxr-xr-xcore/res/res/values/symbols.xml8
5 files changed, 28 insertions, 8 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index a1a0867..404564b 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -2864,6 +2864,13 @@ public class Intent implements Parcelable, Cloneable {
"android.intent.action.SHOW_BRIGHTNESS_DIALOG";
/**
+ * Activity Action: Shows the notification brightness setting dialog.
+ * @hide
+ */
+ public static final String ACTION_SHOW_NOTIFICATION_BRIGHTNESS_DIALOG =
+ "android.intent.action.SHOW_NOTIFICATION_BRIGHTNESS_DIALOG";
+
+ /**
* Broadcast Action: A global button was pressed. Includes a single
* extra field, {@link #EXTRA_KEY_EVENT}, containing the key event that
* caused the broadcast.
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 3d2118c..81166ea 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3222,6 +3222,13 @@ public final class Settings {
public static final Validator SHOW_WEB_SUGGESTIONS_VALIDATOR = sBooleanValidator;
/**
+ * Contains the notifications light maximum brightness to use.
+ * @hide
+ */
+ public static final String NOTIFICATION_LIGHT_BRIGHTNESS_LEVEL =
+ "notification_light_brightness_level";
+
+ /**
* Whether to allow notifications with the screen on or DayDreams.
* The value is boolean (1 or 0). Default will always be false.
* @hide
@@ -3998,6 +4005,7 @@ public final class Settings {
PHONE_BLACKLIST_PRIVATE_NUMBER_MODE,
PHONE_BLACKLIST_UNKNOWN_NUMBER_MODE,
PHONE_BLACKLIST_REGEX_ENABLED,
+ NOTIFICATION_LIGHT_BRIGHTNESS_LEVEL,
NOTIFICATION_LIGHT_SCREEN_ON
};
diff --git a/core/res/res/values/cm_symbols.xml b/core/res/res/values/cm_symbols.xml
index 26bc0f3..59ea24d 100644
--- a/core/res/res/values/cm_symbols.xml
+++ b/core/res/res/values/cm_symbols.xml
@@ -40,6 +40,15 @@
<!-- Proximity check on screen on default -->
<java-symbol type="bool" name="config_proximityCheckOnWakeEnabledByDefault" />
+ <!-- Notification and battery light -->
+ <java-symbol type="bool" name="config_adjustableNotificationLedBrightness" />
+ <java-symbol type="bool" name="config_intrusiveNotificationLed" />
+ <java-symbol type="bool" name="config_multiColorNotificationLed" />
+ <java-symbol type="bool" name="config_intrusiveBatteryLed" />
+ <java-symbol type="bool" name="config_multiColorBatteryLed" />
+ <java-symbol type="array" name="notification_light_package_mapping" />
+ <java-symbol type="array" name="config_notificationNoAlertsVibePattern" />
+
<!-- Package Manager -->
<java-symbol type="array" name="config_disabledComponents" />
<java-symbol type="array" name="config_forceEnabledComponents" />
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index e5203d1..b87a5fc 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -875,6 +875,10 @@
<!-- Default value for LED on time when the battery is low on charge in miliseconds -->
<integer name="config_notificationsBatteryLedOn">125</integer>
+ <!-- Is the notification LED brightness adjustable ?
+ Used to decide if the user can set LED brightness -->
+ <bool name="config_adjustableNotificationLedBrightness">false</bool>
+
<!-- Is the notification LED intrusive? Used to decide if there should be a disable option -->
<bool name="config_intrusiveNotificationLed">false</bool>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index f673fa7..6643cf3 100755
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2400,14 +2400,6 @@
<java-symbol type="bool" name="config_samsung_stk" />
<java-symbol type="bool" name="config_hasRemovableLid" />
- <!-- Notification and battery light -->
- <java-symbol type="bool" name="config_intrusiveNotificationLed" />
- <java-symbol type="bool" name="config_multiColorNotificationLed" />
- <java-symbol type="bool" name="config_intrusiveBatteryLed" />
- <java-symbol type="bool" name="config_multiColorBatteryLed" />
- <java-symbol type="array" name="notification_light_package_mapping" />
- <java-symbol type="array" name="config_notificationNoAlertsVibePattern" />
-
<!-- Power menu -->
<java-symbol type="drawable" name="ic_lock_screenshot" />
<java-symbol type="string" name="global_action_screenshot" />