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

Merge "Unlock icon plays success haptic on device entry" into sc-v2-dev am: eeb998c093

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

Change-Id: I09e5d261ff8f39253835b3392ff4c4284b3ef796
This commit is contained in:
TreeHugger Robot
2021-12-06 22:57:55 +00:00
committed by Automerger Merge Worker
parent 6090871941 eeb998c093
commit 6f922ba0bf
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
View File

@@ -93,7 +93,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
.setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION) .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
.build(); .build();
private static final long LONG_PRESS_TIMEOUT = 150L; // milliseconds private static final long LONG_PRESS_TIMEOUT = 200L; // milliseconds
@NonNull private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; @NonNull private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;
@NonNull private final KeyguardViewController mKeyguardViewController; @NonNull private final KeyguardViewController mKeyguardViewController;
@@ -686,6 +686,17 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
if (mOnGestureDetectedRunnable != null) { if (mOnGestureDetectedRunnable != null) {
mOnGestureDetectedRunnable.run(); mOnGestureDetectedRunnable.run();
} }
if (mVibrator != null) {
// play device entry haptic (same as biometric success haptic)
mVibrator.vibrate(
Process.myUid(),
getContext().getOpPackageName(),
UdfpsController.EFFECT_CLICK,
"lock-icon-device-entry",
VIBRATION_SONIFICATION_ATTRIBUTES);
}
mKeyguardViewController.showBouncer(/* scrim */ true); mKeyguardViewController.showBouncer(/* scrim */ true);
} }