am 5a3322fe: Merge "Fix unresponsive back button in keyguard." into jb-mr1-dev (263d99aa) · Commits · e / os / android_frameworks_base

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

+8 −11

Original line number	Diff line number	Diff line
		@@ -266,17 +266,6 @@ 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;
		@@ -859,4 +848,12 @@ public class KeyguardHostView extends KeyguardViewBase {
		mAppWidgetContainer.setCurrentPage(getWidgetPosition(R.id.keyguard_multi_user_selector));
		}

		public boolean handleBackKey() {
		if (mCurrentSecuritySelection != SecurityMode.None) {
		mCallback.dismiss(false);
		return true;
		}
		return false;
		}

		}

+12 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,18 @@ public class KeyguardViewManager {
		super.onConfigurationChanged(newConfig);
		maybeCreateKeyguardLocked(shouldEnableScreenRotation(), null);
		}

		@Override
		public boolean dispatchKeyEvent(KeyEvent event) {
		if (event.getAction() == KeyEvent.ACTION_DOWN
		&& event.getKeyCode() == KeyEvent.KEYCODE_BACK
		&& mKeyguardView != null) {
		if (mKeyguardView.handleBackKey()) {
		return true;
		}
		}
		return super.dispatchKeyEvent(event);
		}
		}

		SparseArray<Parcelable> mStateContainer = new SparseArray<Parcelable>();