summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider/Settings.java
diff options
context:
space:
mode:
authorDanesh M <daneshm90@gmail.com>2012-07-15 22:18:41 -0400
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2012-12-09 06:53:52 -0800
commitea84c3c3b3336f278a215bbcdf8ab6c4ad9539e4 (patch)
tree9383cd6210e99df1c7a5039e0cb7fdb3759429b4 /core/java/android/provider/Settings.java
parent8339e085c8806100076e2f97c08e42a2e60f6ec4 (diff)
downloadframeworks_base-ea84c3c3b3336f278a215bbcdf8ab6c4ad9539e4.zip
frameworks_base-ea84c3c3b3336f278a215bbcdf8ab6c4ad9539e4.tar.gz
frameworks_base-ea84c3c3b3336f278a215bbcdf8ab6c4ad9539e4.tar.bz2
Framework : Lockscreen - Customizable shortcuts
Patchset 1 : Initial port Patchset 2 : Disable magneticTargets Patchset 3 : Disable firstOffset Patchset 4-5 : Cherry pick 10.0 commits ---------------- Squashed Commits ------------------ Allow users to choose lockscreen shortcuts / icons : Phone - 1-5 targets Tablets - 1-8 targets CM10 port --------- Patchset 1-8: Initial port Patchset 9 : Revert to CM9 drawables Patchset 10 : Rebase Change-Id: I9b163efeef8f47b1d21f7f61552ebe424049cfeb Fix all upscaled lockscreen drawables and add a few Several of the original CM9 drawables were upscaled from a lower quality source. I rescaled some from the originals and recreated the missing ones in vector format plus added some new ones. Change-Id: I112c35cf087daf0679a12bdad89258121dedeb0c Lockscreen : Update camera availability check Make the default availability of the target dependant on the availability of a camera rather than the presense of a predefined resource. Also update .Camera to .CameraLauncher since that is what we default too. Change-Id: Ib3f06cc76fb7f7df20ec632051d5dbe754a9c69e LockscreenShortcuts : Fix minor bugs Fixes : - Inability to have contacts/direct dials..etc on lockscreen (http://goo.gl/BKEJs) - Multiple activities of same type on stack. Change-Id: I6c2c3e1c87239267601d78eb38778d0388f4a41c Lockscreen : Fix blank target highlight Mismatched file/image. Change-Id: I7cd898646124114a855d0fc1589251cbc6fc72fa ---------------------------------------------------- Change-Id: I9b163efeef8f47b1d21f7f61552ebe424049cfeb
Diffstat (limited to 'core/java/android/provider/Settings.java')
-rw-r--r--core/java/android/provider/Settings.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index ca90505..6ecd103 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2464,6 +2464,12 @@ public final class Settings {
public static final String LOCKSCREEN_DISABLED = "lockscreen.disabled";
/**
+ * Stores values for custom lockscreen targets
+ * @hide
+ */
+ public static final String LOCKSCREEN_TARGETS = "lockscreen_targets";
+
+ /**
* @deprecated Use {@link android.provider.Settings.Global#LOW_BATTERY_SOUND}
* instead
* @hide