diff options
author | Adam Cohen <adamcohen@google.com> | 2012-10-03 20:03:18 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2012-10-04 17:53:01 -0700 |
commit | f752202bee88e31ce765483ba2efa6999ae9c9ad (patch) | |
tree | bdab562d4383a67f3806617d2ca3aa3e53862d67 /core/java/com/android/internal/widget/LockPatternUtils.java | |
parent | 17f36d154f1a8ebe72fc35af332f5c0069503364 (diff) | |
download | frameworks_base-f752202bee88e31ce765483ba2efa6999ae9c9ad.zip frameworks_base-f752202bee88e31ce765483ba2efa6999ae9c9ad.tar.gz frameworks_base-f752202bee88e31ce765483ba2efa6999ae9c9ad.tar.bz2 |
Plumbing to allow keyguard to be shown with user switcher (issue 7175023)
-> Also reduced calls to lockNow, and moved this call in ActivityManagerService
Change-Id: I9ba34ca902f7c0f71fa4ec302104688ca8d11f55
Diffstat (limited to 'core/java/com/android/internal/widget/LockPatternUtils.java')
-rw-r--r-- | core/java/com/android/internal/widget/LockPatternUtils.java | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index f987fc5..d14b1ee 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -27,6 +27,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.os.Binder; +import android.os.Bundle; import android.os.IBinder; import android.os.Process; import android.os.RemoteException; @@ -99,6 +100,26 @@ public class LockPatternUtils { public static final int MIN_PATTERN_REGISTER_FAIL = MIN_LOCK_PATTERN_SIZE; /** + * Tells the keyguard to show the user switcher when the keyguard is created. + */ + public static final String KEYGUARD_SHOW_USER_SWITCHER = "showuserswitcher"; + + /** + * Tells the keyguard to show the security challenge when the keyguard is created. + */ + public static final String KEYGUARD_SHOW_SECURITY_CHALLENGE = "showsecuritychallenge"; + + /** + * Options used to lock the device upon user switch. + */ + public static final Bundle USER_SWITCH_LOCK_OPTIONS = new Bundle(); + + static { + USER_SWITCH_LOCK_OPTIONS.putBoolean(KEYGUARD_SHOW_USER_SWITCHER, true); + USER_SWITCH_LOCK_OPTIONS.putBoolean(KEYGUARD_SHOW_SECURITY_CHALLENGE, true); + } + + /** * The bit in LOCK_BIOMETRIC_WEAK_FLAGS to be used to indicate whether liveliness should * be used */ |