summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2011-06-27 17:55:20 -0700
committerJim Miller <jaggies@google.com>2011-06-27 18:00:46 -0700
commit2e4aa1888461426072f27217b8f9eb06f345bb9d (patch)
tree2a6babb3a000d97a255c44faeae6b06fa82b2884 /policy
parentabb04eec06bce358826e4cb6b5f852424ece8005 (diff)
downloadframeworks_base-2e4aa1888461426072f27217b8f9eb06f345bb9d.zip
frameworks_base-2e4aa1888461426072f27217b8f9eb06f345bb9d.tar.gz
frameworks_base-2e4aa1888461426072f27217b8f9eb06f345bb9d.tar.bz2
Fix 4691563: Don't show lock before unlock screen
- Rename config_enableSlidingTabFirst to config_enableLockBeforeUnlockScreen and default to 'false' on all devices. - Use new larger handle asset. Change-Id: I2537158b67642eb3f4c4a22a0bc388bf3022d408
Diffstat (limited to 'policy')
-rw-r--r--policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
index eea3040..b60bae7 100644
--- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
+++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
@@ -682,8 +682,9 @@ public class LockPatternKeyguardView extends KeyguardViewBase {
final boolean usingLockPattern = mLockPatternUtils.getKeyguardStoredPasswordQuality()
== DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
- boolean showSlidingTab = getResources().getBoolean(R.bool.config_enableSlidingTabFirst);
- if (isSecure() && (usingLockPattern || !showSlidingTab)) {
+ boolean showLockBeforeUnlock = getResources()
+ .getBoolean(R.bool.config_enableLockBeforeUnlockScreen);
+ if (isSecure() && (usingLockPattern || !showLockBeforeUnlock)) {
return Mode.UnlockScreen;
} else {
return Mode.LockScreen;