commit 3ed328ecb77a55d90c8818a354533c9631b15cf4
author Jorim Jaggi <jjaggi@google.com> Mon Apr 07 17:59:18 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 07 17:59:18 2014 +0000
tree cfe811876de87135ff08c1cfddf6356479f09d1a
parent 9afbfaf52ef146f8b6585304d85f46f7bd9b009f
parent 0bed7f258ba1fffc10f986ee043b769f1fd40ad3

Merge "Always go through bouncer when unlocking" into master-lockscreen-dev

packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java

diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java b/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java
index d3a5941..2ea8f85 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java
@@ -120,9 +120,11 @@
 
     /**
      *  Dismisses the keyguard by going to the next screen or making it gone.
+     *
+     *  @return True if the keyguard is done.
      */
-    public void dismiss() {
-        dismiss(false);
+    public boolean dismiss() {
+        return dismiss(false);
     }
 
     private void setBackButtonEnabled(boolean enabled) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
index d7a9e07..11ccf2e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
@@ -60,8 +60,13 @@
 
     public void show() {
         ensureView();
-        mRoot.setVisibility(View.VISIBLE);
-        mKeyguardView.requestFocus();
+
+        // Try to dismiss the Keyguard. If no security pattern is set, this will dismiss the whole
+        // Keyguard. If we need to authenticate, show the bouncer.
+        if (!mKeyguardView.dismiss()) {
+            mRoot.setVisibility(View.VISIBLE);
+            mKeyguardView.requestFocus();
+        }
     }
 
     public void hide() {

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
index d6bc056..73fc466 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -155,11 +155,7 @@
      */
     public void dismiss() {
         if (mScreenOn) {
-            if (mLockPatternUtils.isSecure()) {
-                showBouncer();
-            } else {
-                mViewMediatorCallback.keyguardDone(false);
-            }
+            showBouncer();
         }
     }