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

Author: Brian Colonna

policy/src/com/android/internal/policy/impl/KeyguardViewBase.java

@@ -98,6 +98,11 @@ public KeyguardViewCallback getCallback() {
      */
     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

policy/src/com/android/internal/policy/impl/KeyguardViewManager.java

@@ -167,7 +167,7 @@ public synchronized void show() {
             mKeyguardHost.addView(mKeyguardView, lp);
 
             if (mScreenOn) {
-                mKeyguardView.onScreenTurnedOn();
+                mKeyguardView.show();
             }
         }
 

policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java

@@ -512,11 +512,7 @@ public void onScreenTurnedOff() {
     @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 void onScreenTurnedOn() {
         }
     }
 
+    @Override
+    public void show() {
+        if (mMode == Mode.LockScreen) {
+            ((KeyguardScreen) mLockScreen).onResume();
+        } else {
+            ((KeyguardScreen) mUnlockScreen).onResume();
+        }
+    }
+
     private void recreateLockScreen() {
         if (mLockScreen != null) {
             ((KeyguardScreen) mLockScreen).onPause();