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

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

Change-Id: Ic7e09b4a7db59e1d1775937f025f8aec7d800217
This commit is contained in:
Lais Andrade
2021-05-13 19:11:27 +00:00
committed by Automerger Merge Worker

View File

@@ -5130,6 +5130,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) {
@@ -5142,7 +5143,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: