diff options
| author | 2021-05-13 18:37:32 +0000 | |
|---|---|---|
| committer | 2021-05-13 18:37:32 +0000 | |
| commit | 777b5e12fe6fc346ceca0f50f56943b0a8d65e40 (patch) | |
| tree | c901727d64e6a7888d02b643fa299c0f782c4314 | |
| parent | 2543a4d376df907cc71df6a99cf81c4e1fc26bb0 (diff) | |
| parent | 12ffac178a6e486bcfc904c0c769b53af41fb6db (diff) | |
Merge "Use a fallback vibration effect for GESTURE_END" am: 12ffac178a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675891
Change-Id: I512ba8ccfbaeafa4e8ac32ebfe9164a2b605f994
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index fa64df5b1670..836e6150414c 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -5257,6 +5257,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { long[] pattern; switch (effectId) { case HapticFeedbackConstants.CONTEXT_CLICK: + case HapticFeedbackConstants.GESTURE_END: return VibrationEffect.get(VibrationEffect.EFFECT_TICK); case HapticFeedbackConstants.TEXT_HANDLE_MOVE: if (!mHapticTextHandleEnabled) { @@ -5269,7 +5270,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { case HapticFeedbackConstants.VIRTUAL_KEY_RELEASE: case HapticFeedbackConstants.ENTRY_BUMP: case HapticFeedbackConstants.DRAG_CROSSING: - case HapticFeedbackConstants.GESTURE_END: return VibrationEffect.get(VibrationEffect.EFFECT_TICK, false); case HapticFeedbackConstants.KEYBOARD_TAP: // == KEYBOARD_PRESS case HapticFeedbackConstants.VIRTUAL_KEY: |