summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-10-24 18:28:21 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-24 18:28:21 -0700
commit147dfc8642ecbdce527d18bdbeece7b7d05dc883 (patch)
tree73d1362f7546a517bcf437c724a2078791f1d551 /core/java/android
parentdb3efba6fc3a71cfd0a6406704970f1bcb13242f (diff)
parentaa2859ae61098509495b7938e32a6d59d37561be (diff)
downloadframeworks_base-147dfc8642ecbdce527d18bdbeece7b7d05dc883.zip
frameworks_base-147dfc8642ecbdce527d18bdbeece7b7d05dc883.tar.gz
frameworks_base-147dfc8642ecbdce527d18bdbeece7b7d05dc883.tar.bz2
Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/provider/Settings.java11
1 files changed, 2 insertions, 9 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 8897039..cda0f36 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3222,18 +3222,11 @@ public final class Settings {
public static final String LOCK_SCREEN_OWNER_INFO = "lock_screen_owner_info";
/**
- * Id of the time appwidget on the lockscreen, or -1 if none
- * @hide
- */
- 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
* @hide
*/
- public static final String LOCK_SCREEN_USER_SELECTED_APPWIDGET_ID =
- "lock_screen_user_selected_appwidget_id";
+ public static final String LOCK_SCREEN_APPWIDGET_IDS =
+ "lock_screen_appwidget_ids";
/**
* This preference enables showing the owner info on LockScren.