Address comments from merged "Fix remaining jank in sec..."
Cleanup based on post-merge comments on:
I554ddffb7981488fa8a81933842b0c7730e775f3
Bug:7482560
Change-Id: I06b2bc91da9dfddd06db69efb9e7ad45c304f709
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 dbb3577..7ce0544 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.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 5b9eb86..2115602 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.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 @@
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 e1a0a21..7e6c108 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityCallback.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityCallback.java
@@ -15,14 +15,10 @@
*/
package com.android.internal.policy.impl.keyguard;
+import com.android.internal.policy.impl.keyguard.KeyguardHostView.OnDismissAction;
+
public interface KeyguardSecurityCallback {
- /*package*/ interface OnDismissAction {
-
- /* returns true if the dismiss should be deferred */
- boolean onDismiss();
- }
-
/**
* Dismiss the given security screen.
* @param securityVerified true if the user correctly entered credentials for the given 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 23c642d..df4c661 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 @@
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 @@
mKeyguardViewManager.show(options);
mShowing = true;
+ mKeyguardDonePending = false;
updateActivityLockScreenState();
adjustStatusBarLocked();
userActivity();
@@ -1261,6 +1264,7 @@
mKeyguardViewManager.hide();
mShowing = false;
+ mKeyguardDonePending = false;
updateActivityLockScreenState();
adjustStatusBarLocked();
}