diff options
| author | Jim Miller <jaggies@google.com> | 2011-01-16 16:06:51 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-16 16:06:51 -0800 |
| commit | 1f6e37efecb0f5e9a4b5f7ee90b24740f6e02d1a (patch) | |
| tree | 4a0d341cd1e15404cb581e4f52fc6a72a831a9d3 | |
| parent | 6374d7e2e0b55872cc7194484c1a4496b4039853 (diff) | |
| parent | b47bed9c48f73dbd94c0240983f61edc875e99f5 (diff) | |
| download | frameworks_base-1f6e37efecb0f5e9a4b5f7ee90b24740f6e02d1a.zip frameworks_base-1f6e37efecb0f5e9a4b5f7ee90b24740f6e02d1a.tar.gz frameworks_base-1f6e37efecb0f5e9a4b5f7ee90b24740f6e02d1a.tar.bz2 | |
Merge "Fix 3355957: Don't hide the keyboard for PIN/Password" into honeycomb
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java | 11 |
1 files 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 9db86aa..b789288 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); } |