diff options
| author | Jim Miller <jaggies@google.com> | 2010-08-30 21:21:34 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2010-09-01 21:00:30 -0700 |
| commit | bc4603b0b1f1242387655274e39649882ca391d1 (patch) | |
| tree | 2fa809bcb70cae54ca0a5fae704bade74d728c64 /core/java/android/provider | |
| parent | 5486dcb00a44f6367a880cf7ea7f699bfa1e15cb (diff) | |
| download | frameworks_base-bc4603b0b1f1242387655274e39649882ca391d1.zip frameworks_base-bc4603b0b1f1242387655274e39649882ca391d1.tar.gz frameworks_base-bc4603b0b1f1242387655274e39649882ca391d1.tar.bz2 | |
Fix 2579224: Add a separate timeout for lockscreen vs display
This change adds a second timeout to the SecuritySettings page
separate from the standard display timeout.
Change-Id: I41fe10e31688308f52695ad3ee30a4b0507112bd
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 158558e..dcd1d94 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2421,6 +2421,14 @@ public final class Settings { "lock_pattern_tactile_feedback_enabled"; /** + * This preference allows the device to be locked given time after screen goes off, + * subject to current DeviceAdmin policy limits. + * @hide + */ + public static final String LOCK_SCREEN_LOCK_AFTER_TIMEOUT = "lock_screen_lock_after_timeout"; + + + /** * Whether assisted GPS should be enabled or not. * @hide */ |