Merge "Don't request PIN field focus again unless re-enabled" into sc-dev (e85e1513) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -62,9 +62,10 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView

		@Override
		protected void setPasswordEntryEnabled(boolean enabled) {
		boolean wasEnabled = mPasswordEntry.isEnabled();
		mPasswordEntry.setEnabled(enabled);
		mOkButton.setEnabled(enabled);
		if (enabled && !mPasswordEntry.hasFocus()) {
		if (enabled && !wasEnabled && !mPasswordEntry.hasFocus()) {
		mPasswordEntry.requestFocus();
		}
		}