summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-09-21 01:10:53 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-21 01:10:53 -0700
commit7566abd305a2b3060ae541055ed04f087f5266ec (patch)
treef6eecf5777a01f96537abab36306398b41d9c042 /core/java/android/provider
parentc9cc62b96561933dd9257a78c6749195fbe8fdd3 (diff)
parent20c41d5382b70fa5a24e9ef68f19ce0aedea5234 (diff)
downloadframeworks_base-7566abd305a2b3060ae541055ed04f087f5266ec.zip
frameworks_base-7566abd305a2b3060ae541055ed04f087f5266ec.tar.gz
frameworks_base-7566abd305a2b3060ae541055ed04f087f5266ec.tar.bz2
Merge "Add support for changing status widget on security screen" into jb-mr1-dev
Diffstat (limited to 'core/java/android/provider')
-rw-r--r--core/java/android/provider/Settings.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index cc9abff..66738a1 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3219,8 +3219,8 @@ public final class Settings {
* Id of the time appwidget on the lockscreen, or -1 if none
* @hide
*/
- public static final String LOCK_SCREEN_CLOCK_APPWIDGET_ID =
- "lock_screen_clock_appwidget_id";
+ public static final String LOCK_SCREEN_STATUS_APPWIDGET_ID =
+ "lock_screen_status_appwidget_id";
/**
* Id of the user-selected appwidget on the lockscreen, or -1 if none