Merge "This enables the back button in keyguard" into jb-mr1-dev

2012-09-11 13:56:52 -07:00
parent b0246ce14a 644ea77b4f
commit 752ef4e0f8
1 changed files with 11 additions and 0 deletions
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
@@ -214,6 +214,17 @@ public class KeyguardHostView extends KeyguardViewBase {
        dialog.show();
    }

+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+        if (event.getAction() == KeyEvent.ACTION_UP
+                && event.getKeyCode() == KeyEvent.KEYCODE_BACK
+                && mCurrentSecuritySelection != SecurityMode.None) {
+            mCallback.dismiss(false);
+            return true;
+        }
+        return super.dispatchKeyEvent(event);
+    }
+
    private void showTimeoutDialog() {
        int timeoutInSeconds = (int) LockPatternUtils.FAILED_ATTEMPT_TIMEOUT_MS / 1000;
        int messageId = 0;