Skip to content

Commit 644ea77

Browse files
author
Jim Miller
committed
This enables the back button in keyguard
When pressed, the back button now takes the user to the selector screen. Change-Id: Ib8d86c6fe0b46de5ad482d526783b4542fdb3336
1 parent add52a9 commit 644ea77

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import android.content.res.Resources;
3434
import android.graphics.Canvas;
3535
import android.os.UserManager;
36-
import android.telephony.TelephonyManager;
3736
import android.util.AttributeSet;
3837
import android.util.Log;
3938
import android.util.Slog;
@@ -42,7 +41,6 @@
4241
import android.view.View;
4342
import android.view.WindowManager;
4443
import android.view.animation.AnimationUtils;
45-
import android.widget.Button;
4644
import android.widget.RemoteViews.OnClickHandler;
4745
import android.widget.ViewFlipper;
4846

@@ -51,7 +49,6 @@
5149
import com.android.internal.widget.LockPatternUtils;
5250

5351
import java.io.File;
54-
import java.util.ArrayList;
5552
import java.util.List;
5653

5754
public class KeyguardHostView extends KeyguardViewBase {
@@ -202,6 +199,17 @@ private void showDialog(String title, String message) {
202199
dialog.show();
203200
}
204201

202+
@Override
203+
public boolean dispatchKeyEvent(KeyEvent event) {
204+
if (event.getAction() == KeyEvent.ACTION_UP
205+
&& event.getKeyCode() == KeyEvent.KEYCODE_BACK
206+
&& mCurrentSecuritySelection != SecurityMode.None) {
207+
mCallback.dismiss(false);
208+
return true;
209+
}
210+
return super.dispatchKeyEvent(event);
211+
}
212+
205213
private void showTimeoutDialog() {
206214
int timeoutInSeconds = (int) LockPatternUtils.FAILED_ATTEMPT_TIMEOUT_MS / 1000;
207215
int messageId = 0;

0 commit comments

Comments
 (0)