From b47bed9c48f73dbd94c0240983f61edc875e99f5 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Sun, 16 Jan 2011 14:52:53 -0800 Subject: [PATCH] Fix 3355957: Don't hide the keyboard for PIN/Password BT or USB keyboards currently cause the on-screen keyboard to be hidden. This will probably need to be refactored in the future but the change is too complicated for the current release. Change-Id: Ieb655b85622f7c174ed4a5d1c3766d130a9d32f1 --- .../internal/policy/impl/PasswordUnlockScreen.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java b/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java index 9db86aa42d8bd..b789288051c7d 100644 --- a/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java +++ b/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java @@ -109,22 +109,21 @@ public class PasswordUnlockScreen extends LinearLayout implements KeyguardScreen mLockPatternUtils.updateEmergencyCallButtonState(mEmergencyCallButton); mKeyboardHelper = new PasswordEntryKeyboardHelper(context, mKeyboardView, this, false); + // TODO: re-enable on phones with keyboards + boolean isPhysicalKbShowing = false; + //mCreationHardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO; if (mKeyboardViewAlpha == null || !mIsAlpha) { mKeyboardHelper.setKeyboardMode(mIsAlpha ? PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA : PasswordEntryKeyboardHelper.KEYBOARD_MODE_NUMERIC); - mKeyboardView.setVisibility( - mCreationHardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO - ? View.INVISIBLE : View.VISIBLE); + mKeyboardView.setVisibility(isPhysicalKbShowing ? View.INVISIBLE : View.VISIBLE); } else { mKeyboardHelperAlpha = new PasswordEntryKeyboardHelper(context, mKeyboardViewAlpha, this, false); mKeyboardHelper.setKeyboardMode(PasswordEntryKeyboardHelper.KEYBOARD_MODE_NUMERIC); mKeyboardHelperAlpha.setKeyboardMode(PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA); mKeyboardView.setVisibility(View.GONE); - mKeyboardViewAlpha.setVisibility( - mCreationHardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO - ? View.INVISIBLE : View.VISIBLE); + mKeyboardViewAlpha.setVisibility(isPhysicalKbShowing ? View.INVISIBLE : View.VISIBLE); mPasswordEntry.setWidth(mKeyboardViewAlpha.getLayoutParams().width); }