Pulled out part of onScreenTurnedOn() into show() function

The onScreenTurnedOn() function in LockPatternKeyguardView was
actually being called in two cases - when the screen was turned on,
AND when the show() function was called in KeyguardViewManager, which
actually happens just before the screen is turned off.  Face Unlock
functionality was added to the onScreenTurnedOn() function, not
expecting that the function was also being called just before the
screen turns off.  This causes Face Unlock to run when the screen is
turned off, preventing it from running when the screen is turned on.
This was not obvious during testing because it's not a problem when
testing from the lock screen.  To reproduce the problem you must log
in successfully, then turn the screen off, wait, and turn it back on.

The solution was to pull the non-face unlock functionality from
onScreenTurnedOn() into its own function called show(), which is
called from the KeyguardViewManager show() function and also called
from onScreenTurnedOn().  In this way, the onScreenTurnedOn()
functionality is not changed, but the show() function can be used
for the onScreenTurnedOn() functionality minus the Face Unlock stuff.

One exception to note - I left setting mScreenOn inside of
onScreenTurnedOn() and didn't pull it into show()...that seems like
the correct thing to do.

Change-Id: I9dcc144c7842112c4d35eb3f8b4ab1cd42c05675

3 files changed, 16 insertions, 6 deletions

diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewBase.java b/policy/src/com/android/internal/policy/impl/KeyguardViewBase.java
index 74dde9c..59b546d 100644
--- a/policy/src/com/android/internal/policy/impl/KeyguardViewBase.java
+++ b/policy/src/com/android/internal/policy/impl/KeyguardViewBase.java
@@ -99,6 +99,11 @@ public abstract class KeyguardViewBase extends FrameLayout {
     abstract public void onScreenTurnedOn();
 
     /**
+     * Called when the view needs to be shown.
+     */
+    abstract public void show();
+
+    /**
      * Called when a key has woken the device to give us a chance to adjust our
      * state according the the key.  We are responsible for waking the device
      * (by poking the wake lock) once we are ready.
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java b/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java
index f15812b..90972da 100644
--- a/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java
+++ b/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java
@@ -167,7 +167,7 @@ public class KeyguardViewManager implements KeyguardWindowController {
             mKeyguardHost.addView(mKeyguardView, lp);
 
             if (mScreenOn) {
-                mKeyguardView.onScreenTurnedOn();
+                mKeyguardView.show();
             }
         }
 
diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
index f24991c..325dfd3 100644
--- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
+++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
@@ -512,11 +512,7 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler
     @Override
     public void onScreenTurnedOn() {
         mScreenOn = true;
-        if (mMode == Mode.LockScreen) {
-            ((KeyguardScreen) mLockScreen).onResume();
-        } else {
-            ((KeyguardScreen) mUnlockScreen).onResume();
-        }
+        show();
 
         // When screen is turned on, need to bind to FaceLock service if we are using FaceLock
         // But only if not dealing with a call
@@ -527,6 +523,15 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler
         }
     }
 
+    @Override
+    public void show() {
+        if (mMode == Mode.LockScreen) {
+            ((KeyguardScreen) mLockScreen).onResume();
+        } else {
+            ((KeyguardScreen) mUnlockScreen).onResume();
+        }
+    }
+
     private void recreateLockScreen() {
         if (mLockScreen != null) {
             ((KeyguardScreen) mLockScreen).onPause();