diff options
4 files changed, 12 insertions, 8 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java index dbb357710850..7ce0544d9446 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java @@ -35,7 +35,7 @@ import android.provider.MediaStore; import android.util.Log; import android.view.WindowManager; -import com.android.internal.policy.impl.keyguard.KeyguardSecurityCallback.OnDismissAction; +import com.android.internal.policy.impl.keyguard.KeyguardHostView.OnDismissAction; import com.android.internal.widget.LockPatternUtils; import java.util.List; diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java index 5b9eb8672812..211560215830 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java @@ -53,7 +53,6 @@ import android.view.animation.AnimationUtils; import android.widget.RemoteViews.OnClickHandler; import com.android.internal.R; -import com.android.internal.policy.impl.keyguard.KeyguardSecurityCallback.OnDismissAction; import com.android.internal.policy.impl.keyguard.KeyguardSecurityModel.SecurityMode; import com.android.internal.widget.LockPatternUtils; @@ -115,6 +114,11 @@ public class KeyguardHostView extends KeyguardViewBase { void userActivity(); } + /*package*/ interface OnDismissAction { + /* returns true if the dismiss should be deferred */ + boolean onDismiss(); + } + public KeyguardHostView(Context context) { this(context, null); } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityCallback.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityCallback.java index e1a0a211f02e..7e6c108908ea 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityCallback.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityCallback.java @@ -15,13 +15,9 @@ */ package com.android.internal.policy.impl.keyguard; -public interface KeyguardSecurityCallback { - - /*package*/ interface OnDismissAction { +import com.android.internal.policy.impl.keyguard.KeyguardHostView.OnDismissAction; - /* returns true if the dismiss should be deferred */ - boolean onDismiss(); - } +public interface KeyguardSecurityCallback { /** * Dismiss the given security screen. diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java index 23c642dc882d..df4c661ab2d3 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java @@ -567,6 +567,8 @@ public class KeyguardViewMediator { mScreenOn = false; if (DEBUG) Log.d(TAG, "onScreenTurnedOff(" + why + ")"); + mKeyguardDonePending = false; + // Lock immediately based on setting if secure (user has a pin/pattern/password). // This also "locks" the device when not secure to provide easy access to the // camera while preventing unwanted input. @@ -1226,6 +1228,7 @@ public class KeyguardViewMediator { mKeyguardViewManager.show(options); mShowing = true; + mKeyguardDonePending = false; updateActivityLockScreenState(); adjustStatusBarLocked(); userActivity(); @@ -1261,6 +1264,7 @@ public class KeyguardViewMediator { mKeyguardViewManager.hide(); mShowing = false; + mKeyguardDonePending = false; updateActivityLockScreenState(); adjustStatusBarLocked(); } |