Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f6e37ef authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix 3355957: Don't hide the keyboard for PIN/Password" into honeycomb

parents 6374d7e2 b47bed9c

policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java

+5 −6
Original line number Diff line number Diff line
@@ -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);

        }