From b3f615907d8339e5813457dc8076dbfdadfd2800 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Wed, 27 Jan 2010 20:26:42 -0800 Subject: [PATCH] Fix 2402303: Show pmf3k in front of PIN/Password unlock screens. This came down to a decision; if we want to show other information (owner id, current playing song, etc.) as well as continue to have an easy way to silence the device, we need to have two unlock screens in these cases. We simply don't have enough room on these screens to show anything but the unlock widget and a small bit of text. This change *does not* affect pattern unlock, which will continue to be a single unlock screen. --- .../android/internal/policy/impl/LockPatternKeyguardView.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/policy/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/com/android/internal/policy/impl/LockPatternKeyguardView.java index 1e7d62ec1c4ac..a7fc6b66e2c41 100644 --- a/policy/com/android/internal/policy/impl/LockPatternKeyguardView.java +++ b/policy/com/android/internal/policy/impl/LockPatternKeyguardView.java @@ -625,7 +625,8 @@ public class LockPatternKeyguardView extends KeyguardViewBase final IccCard.State simState = mUpdateMonitor.getSimState(); if (stuckOnLockScreenBecauseSimMissing() || (simState == IccCard.State.PUK_REQUIRED)) { return Mode.LockScreen; - } else if (isSecure()) { + } else if (isSecure() + && mLockPatternUtils.getPasswordMode() == LockPatternUtils.MODE_PATTERN) { return Mode.UnlockScreen; } else { return Mode.LockScreen;