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

Merge "Use a fallback vibration effect for GESTURE_END" am: 12ffac178a

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

Change-Id: I512ba8ccfbaeafa4e8ac32ebfe9164a2b605f994
This commit is contained in:
Lais Andrade
2021-05-13 18:37:32 +00:00
committed by Automerger Merge Worker
parent 2543a4d376 12ffac178a
commit 777b5e12fe
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -5257,6 +5257,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
long[] pattern; long[] pattern;
switch (effectId) { switch (effectId) {
case HapticFeedbackConstants.CONTEXT_CLICK: case HapticFeedbackConstants.CONTEXT_CLICK:
case HapticFeedbackConstants.GESTURE_END:
return VibrationEffect.get(VibrationEffect.EFFECT_TICK); return VibrationEffect.get(VibrationEffect.EFFECT_TICK);
case HapticFeedbackConstants.TEXT_HANDLE_MOVE: case HapticFeedbackConstants.TEXT_HANDLE_MOVE:
if (!mHapticTextHandleEnabled) { if (!mHapticTextHandleEnabled) {
@@ -5269,7 +5270,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
case HapticFeedbackConstants.VIRTUAL_KEY_RELEASE: case HapticFeedbackConstants.VIRTUAL_KEY_RELEASE:
case HapticFeedbackConstants.ENTRY_BUMP: case HapticFeedbackConstants.ENTRY_BUMP:
case HapticFeedbackConstants.DRAG_CROSSING: case HapticFeedbackConstants.DRAG_CROSSING:
case HapticFeedbackConstants.GESTURE_END:
return VibrationEffect.get(VibrationEffect.EFFECT_TICK, false); return VibrationEffect.get(VibrationEffect.EFFECT_TICK, false);
case HapticFeedbackConstants.KEYBOARD_TAP: // == KEYBOARD_PRESS case HapticFeedbackConstants.KEYBOARD_TAP: // == KEYBOARD_PRESS
case HapticFeedbackConstants.VIRTUAL_KEY: case HapticFeedbackConstants.VIRTUAL_KEY: