From 9bab88b20ac716630da52808337886f33a82bb08 Mon Sep 17 00:00:00 2001 From: Lais Andrade Date: Tue, 22 Mar 2022 20:12:40 +0000 Subject: [PATCH] Fix PIN lock pattern not respecting user settings The LockPatternView had a boolean attribute mEnableHapticFeedback that held a copy of the user settings for enabling "Touch feedback" vibrations. This attribute was used together with HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING deprecated setting to bypass the user settings in the vibrator service. This change removes the use of this deprecated flag and lets the Vibrator service apply the user settings for "Touch feedback" to vibrations generated for the PIN lock input in LockPatternView. Fix: 216656312 Test: manual Change-Id: If9733c059e5059b6e58b6f84d100df2a0abafab6 --- core/java/com/android/internal/widget/LockPatternView.java | 4 +--- .../src/com/android/keyguard/KeyguardAbsKeyInputView.java | 3 +-- packages/SystemUI/src/com/android/keyguard/NumPadKey.java | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/core/java/com/android/internal/widget/LockPatternView.java b/core/java/com/android/internal/widget/LockPatternView.java index 01cec7727c4ee..3cbf72034897b 100644 --- a/core/java/com/android/internal/widget/LockPatternView.java +++ b/core/java/com/android/internal/widget/LockPatternView.java @@ -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; diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java index d02b8752469a0..b18abf3fd02cb 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java @@ -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) { diff --git a/packages/SystemUI/src/com/android/keyguard/NumPadKey.java b/packages/SystemUI/src/com/android/keyguard/NumPadKey.java index 5cab547ee435d..f771c974fe603 100644 --- a/packages/SystemUI/src/com/android/keyguard/NumPadKey.java +++ b/packages/SystemUI/src/com/android/keyguard/NumPadKey.java @@ -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); } }