Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix PIN lock pattern not respecting user settings" into tm-dev am: 352d8d7abe

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17320107

Change-Id: I3a87fc4fd783295237e97df34d523e65678cad55
This commit is contained in:
Lais Andrade
2022-03-23 18:37:45 +00:00
committed by Automerger Merge Worker
parent 64e2895add 352d8d7abe
commit a67d59dde1
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/widget/LockPatternView.java
View File

@@ -35,7 +35,6 @@ import android.graphics.RecordingCanvas;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.Shader; import android.graphics.Shader;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.media.AudioManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.Debug; import android.os.Debug;
import android.os.Parcel; import android.os.Parcel;
@@ -769,8 +768,7 @@ public class LockPatternView extends View {
} }
addCellToPattern(cell); addCellToPattern(cell);
performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY, performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY,
HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);
| HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
return cell; return cell;
} }
return null; return null;

3
packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java
View File

@@ -76,8 +76,7 @@ public abstract class KeyguardAbsKeyInputView extends KeyguardInputView {
// Cause a VIRTUAL_KEY vibration // Cause a VIRTUAL_KEY vibration
public void doHapticKeyClick() { public void doHapticKeyClick() {
performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY, performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY,
HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);
| HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
} }
public void setKeyDownListener(KeyDownListener keyDownListener) { public void setKeyDownListener(KeyDownListener keyDownListener) {

3
packages/SystemUI/src/com/android/keyguard/NumPadKey.java
View File

@@ -219,7 +219,6 @@ public class NumPadKey extends ViewGroup {
// Cause a VIRTUAL_KEY vibration // Cause a VIRTUAL_KEY vibration
public void doHapticKeyClick() { public void doHapticKeyClick() {
performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY, performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY,
HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);
| HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
} }
} }