diff options
| author | Jason Monk <jmonk@google.com> | 2014-11-03 14:36:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-03 14:36:02 +0000 |
| commit | 2e647efe01dcdb82d2d7f8a23540ba6b690a95d6 (patch) | |
| tree | 0de5e712eeec4c168a7b0c6f8ed921dea8784817 /core/java/android/provider | |
| parent | 9301eafbcc39f9cf6980f937f78886f35dec9d9f (diff) | |
| parent | 94cfd9d7c42287c18bde29aa1ae34944eb448f45 (diff) | |
| download | frameworks_base-2e647efe01dcdb82d2d7f8a23540ba6b690a95d6.zip frameworks_base-2e647efe01dcdb82d2d7f8a23540ba6b690a95d6.tar.gz frameworks_base-2e647efe01dcdb82d2d7f8a23540ba6b690a95d6.tar.bz2 | |
Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index c54a5ba..1ea520d 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2625,12 +2625,6 @@ public final class Settings { public static final String LOCK_TO_APP_ENABLED = "lock_to_app_enabled"; /** - * Whether lock-to-app will lock the keyguard when exiting. - * @hide - */ - public static final String LOCK_TO_APP_EXIT_LOCKED = "lock_to_app_exit_locked"; - - /** * I am the lolrus. * <p> * Nonzero values indicate that the user has a bukkit. @@ -2704,6 +2698,7 @@ public final class Settings { POINTER_SPEED, VIBRATE_WHEN_RINGING, RINGTONE, + LOCK_TO_APP_ENABLED, NOTIFICATION_SOUND }; @@ -3666,6 +3661,12 @@ public final class Settings { "lock_biometric_weak_flags"; /** + * Whether lock-to-app will lock the keyguard when exiting. + * @hide + */ + public static final String LOCK_TO_APP_EXIT_LOCKED = "lock_to_app_exit_locked"; + + /** * Whether autolock is enabled (0 = false, 1 = true) */ public static final String LOCK_PATTERN_ENABLED = "lock_pattern_autolock"; |