summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2010-12-01 13:20:43 +0000
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2010-12-01 13:20:43 +0000
commit3102f31161394aafdc67448e649311a3c2e6a491 (patch)
treefe0cb0d4122542749f2c25e734dfab38487c46e8
parent1d1a8c79b397251291d67e0da0c885c644fc3937 (diff)
parent92a7e26c3438005042ce44d4a752435062f54ba4 (diff)
downloadframeworks_base-3102f31161394aafdc67448e649311a3c2e6a491.zip
frameworks_base-3102f31161394aafdc67448e649311a3c2e6a491.tar.gz
frameworks_base-3102f31161394aafdc67448e649311a3c2e6a491.tar.bz2
Merge "Lockscreen gestures color setting" into froyo
-rw-r--r--core/java/android/provider/Settings.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 1850150..758b65b 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2384,6 +2384,12 @@ public final class Settings {
public static final String LOCKSCREEN_GESTURES_SENSITIVITY = "lockscreen_gestures_sensitivity";
/**
+ * Color value for gestures on lockscreen
+ * @hide
+ */
+ public static final String LOCKSCREEN_GESTURES_COLOR = "lockscreen_gestures_color";
+
+ /**
* Settings to backup. This is here so that it's in the same place as the settings
* keys and easy to update.
* @hide
@@ -2464,7 +2470,8 @@ public final class Settings {
QUIET_HOURS_MUTE,
QUIET_HOURS_STILL,
QUIET_HOURS_DIM,
- LOCKSCREEN_GESTURES_SENSITIVITY
+ LOCKSCREEN_GESTURES_SENSITIVITY,
+ LOCKSCREEN_GESTURES_COLOR
};
// Settings moved to Settings.Secure