2 files changed, 37 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityViewFlipper.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityViewFlipper.java
index 4fa071c254c3..9cdbc2de203e 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityViewFlipper.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityViewFlipper.java
@@ -68,36 +68,62 @@ public class KeyguardSecurityViewFlipper extends ViewFlipper implements Keyguard
 
     @Override
     public void setKeyguardCallback(KeyguardSecurityCallback callback) {
+        KeyguardSecurityView ksv = getSecurityView();
+        if (ksv != null) {
+            ksv.setKeyguardCallback(callback);
+        }
     }
 
     @Override
     public void setLockPatternUtils(LockPatternUtils utils) {
+        KeyguardSecurityView ksv = getSecurityView();
+        if (ksv != null) {
+            ksv.setLockPatternUtils(utils);
+        }
     }
 
     @Override
     public void reset() {
+        KeyguardSecurityView ksv = getSecurityView();
+        if (ksv != null) {
+            ksv.reset();
+        }
     }
 
     @Override
     public void onPause() {
+        KeyguardSecurityView ksv = getSecurityView();
+        if (ksv != null) {
+            ksv.onPause();
+        }
     }
 
     @Override
     public void onResume() {
+        KeyguardSecurityView ksv = getSecurityView();
+        if (ksv != null) {
+            ksv.onResume();
+        }
     }
 
     @Override
     public boolean needsInput() {
-        return false;
+        KeyguardSecurityView ksv = getSecurityView();
+        return (ksv != null) ? ksv.needsInput() : false;
     }
 
     @Override
     public KeyguardSecurityCallback getCallback() {
-        return null;
+        KeyguardSecurityView ksv = getSecurityView();
+        return (ksv != null) ? ksv.getCallback() : null;
     }
 
     @Override
     public void setSecurityMessageDisplay(SecurityMessageDisplay display) {
+        KeyguardSecurityView ksv = getSecurityView();
+        if (ksv != null) {
+            ksv.setSecurityMessageDisplay(display);
+        }
     }
 
     @Override
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java
index 4f9c1a3e4aa0..c163b975fbc9 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java
@@ -17,6 +17,7 @@ package com.android.internal.policy.impl.keyguard;
 
 import android.os.Handler;
 import android.os.Looper;
+import android.util.Log;
 import android.view.View;
 
 public class KeyguardViewStateManager implements SlidingChallengeLayout.OnChallengeScrolledListener {
@@ -134,6 +135,14 @@ public class KeyguardViewStateManager implements SlidingChallengeLayout.OnChalle
                 mPagedView.setOnlyAllowEdgeSwipes(false);
             }
 
+            if (mChallengeLayout.isChallengeShowing()) {
+                mKeyguardSecurityContainer.onResume();
+            } else {
+                mKeyguardSecurityContainer.onPause();
+            }
+        } else {
+            // View is on the move.  Pause the security view until it completes.
+            mKeyguardSecurityContainer.onPause();
         }
     }