From 09a2e94ab9071319213fb008f30410258c648d38 Mon Sep 17 00:00:00 2001 From: rituj Date: Sat, 11 Jan 2020 13:22:36 +0530 Subject: [aospa][quartz] PhoneWindowManager: Improve haptics Change-Id: I389ade5b2b3c098d78b7267d18c4056dbb7c72be Signed-off-by: rituj --- .../core/java/com/android/server/policy/PhoneWindowManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index d36d64e9d216..169202cb53de 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -6099,14 +6099,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { long[] pattern; switch (effectId) { case HapticFeedbackConstants.CONTEXT_CLICK: - return VibrationEffect.get(VibrationEffect.EFFECT_TICK); + return VibrationEffect.get(VibrationEffect.EFFECT_POP); case HapticFeedbackConstants.TEXT_HANDLE_MOVE: if (!mHapticTextHandleEnabled) { return null; } - // fallthrough - case HapticFeedbackConstants.CLOCK_TICK: return VibrationEffect.get(VibrationEffect.EFFECT_TEXTURE_TICK); + case HapticFeedbackConstants.CLOCK_TICK: + return VibrationEffect.get(VibrationEffect.EFFECT_TICK); case HapticFeedbackConstants.KEYBOARD_RELEASE: case HapticFeedbackConstants.VIRTUAL_KEY_RELEASE: case HapticFeedbackConstants.ENTRY_BUMP: @@ -6116,11 +6116,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { case HapticFeedbackConstants.KEYBOARD_TAP: // == KEYBOARD_PRESS case HapticFeedbackConstants.VIRTUAL_KEY: case HapticFeedbackConstants.EDGE_RELEASE: - case HapticFeedbackConstants.CONFIRM: case HapticFeedbackConstants.GESTURE_START: return VibrationEffect.get(VibrationEffect.EFFECT_CLICK); case HapticFeedbackConstants.LONG_PRESS: case HapticFeedbackConstants.EDGE_SQUEEZE: + case HapticFeedbackConstants.CONFIRM: return VibrationEffect.get(VibrationEffect.EFFECT_HEAVY_CLICK); case HapticFeedbackConstants.REJECT: return VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK); -- cgit v1.2.3