diff options
| author | Robert Burns <burnsra@gmail.com> | 2012-12-06 23:12:12 -0500 |
|---|---|---|
| committer | Robert Burns <burnsra@gmail.com> | 2012-12-09 15:56:09 -0500 |
| commit | 7536aa5014aa2ff2433896c22c0009ca2990fcde (patch) | |
| tree | 339d9cfe4ba1be31c8b94263d68402a9042d1721 /core/java/android/provider/Settings.java | |
| parent | ea84c3c3b3336f278a215bbcdf8ab6c4ad9539e4 (diff) | |
| download | frameworks_base-7536aa5014aa2ff2433896c22c0009ca2990fcde.zip frameworks_base-7536aa5014aa2ff2433896c22c0009ca2990fcde.tar.gz frameworks_base-7536aa5014aa2ff2433896c22c0009ca2990fcde.tar.bz2 | |
Forward port CM Screen Security settings (Part 2 of 2)
Patch Set 1: Quick Unlock
Patch Set 2: Lockscreen Vibrate
Patch Set 3: Slide Lock Delay
Patch Set 4: Menu Unlock
Patch Set 5: Rebase
Patch Set 6: Home Unlock
Change-Id: Ie1ccaec43ca75474e92f96c60e15d7b75796ac5f
Diffstat (limited to 'core/java/android/provider/Settings.java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 6ecd103..db2598f 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2884,6 +2884,18 @@ public final class Settings { public static final String POWER_MENU_SILENT_ENABLED = "power_menu_silent_enabled"; /** + * Whether to unlock the screen with the home key. The value is boolean (1 or 0). + * @hide + */ + public static final String HOME_UNLOCK_SCREEN = "home_unlock_screen"; + + /** + * Whether the lockscreen vibrate should be enabled. + * @hide + */ + public static final String LOCKSCREEN_VIBRATE_ENABLED = "lockscreen.vibrate_enabled"; + + /** * Settings to backup. This is here so that it's in the same place as the settings * keys and easy to update. * @@ -2967,6 +2979,7 @@ public final class Settings { POWER_MENU_AIRPLANE_ENABLED, POWER_MENU_SILENT_ENABLED, POWER_MENU_USER_ENABLED, + LOCKSCREEN_VIBRATE_ENABLED, }; // Settings moved to Settings.Secure |