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

Commit df7adb3a authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Enable haptic feedback from ILockSettings." into jb-dev

parents d9016b2c 3fb0af38

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

+1 −4
Original line number Diff line number Diff line
@@ -113,10 +113,7 @@ public class PasswordUnlockScreen extends LinearLayout implements KeyguardScreen 
        mPasswordEntry.setOnEditorActionListener(this);



        mKeyboardHelper = new PasswordEntryKeyboardHelper(context, mKeyboardView, this, false);

        mKeyboardHelper.setEnableHaptics(

                Settings.Secure.getInt(mContext.getContentResolver(),

                        Settings.Secure.LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED, 0)

                        != 0);

        mKeyboardHelper.setEnableHaptics(mLockPatternUtils.isTactileFeedbackEnabled());

        boolean imeOrDeleteButtonVisible = false;

        if (mIsAlpha) {

            // We always use the system IME for alpha keyboard, so hide lockscreen's soft keyboard