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

Commit 352d8d7a authored by Lais Andrade's avatar Lais Andrade Committed by Android (Google) Code Review
Browse files

Merge "Fix PIN lock pattern not respecting user settings" into tm-dev

parents 65637404 9bab88b2

core/java/com/android/internal/widget/LockPatternView.java

+1 −3
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.graphics.RecordingCanvas; 
import android.graphics.Rect;

import android.graphics.Shader;

import android.graphics.drawable.Drawable;

import android.media.AudioManager;

import android.os.Bundle;

import android.os.Debug;

import android.os.Parcel;
@@ -769,8 +768,7 @@ public class LockPatternView extends View { 
            }

            addCellToPattern(cell);

            performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY,

                    HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING

                    | HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);

                    HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);

            return cell;

        }

        return null;

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

+1 −2
Original line number Diff line number Diff line
@@ -76,8 +76,7 @@ public abstract class KeyguardAbsKeyInputView extends KeyguardInputView { 
    // Cause a VIRTUAL_KEY vibration

    public void doHapticKeyClick() {

        performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY,

                HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING

                | HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);

                HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);

    }



    public void setKeyDownListener(KeyDownListener keyDownListener) {

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

+1 −2
Original line number Diff line number Diff line
@@ -219,7 +219,6 @@ public class NumPadKey extends ViewGroup { 
    // Cause a VIRTUAL_KEY vibration

    public void doHapticKeyClick() {

        performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY,

                HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING

                | HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);

                HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);

    }

}