See also {@link #SEGMENT_FREQUENT_TICK} for cases where density of choices is high, and + * the haptics should be lighter or suppressed for a better user experience. + */ + public static final int SEGMENT_TICK = 26; + + /** + * The user is switching between a series of many potential choices, for example minutes on a + * clock face, or individual percentages. This constant is expected to be very soft, so as + * not to be uncomfortable when performed a lot in quick succession. If the device can’t make + * a suitably soft vibration, then it may not make any vibration. + * + *
Some specializations of this constant exist for specific actions, notably + * {@link #CLOCK_TICK} and {@link #TEXT_HANDLE_MOVE}. + * + *
See also {@link #SEGMENT_TICK}. + */ + public static final int SEGMENT_FREQUENT_TICK = 27; + /** * The phone has booted with safe mode enabled. * This is a private constant. Feel free to renumber as desired. diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 508c6bd64a4c1..d5adb236c34f1 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -27271,7 +27271,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @param flags Additional flags as per {@link HapticFeedbackConstants}. */ public boolean performHapticFeedback(int feedbackConstant, int flags) { - if (mAttachInfo == null) { + if (feedbackConstant == HapticFeedbackConstants.NO_HAPTICS + || mAttachInfo == null) { return false; } //noinspection SimplifiableIfStatement diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 5a0c3443078d8..85c682fb5e94a 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -5722,44 +5722,53 @@ public class PhoneWindowManager implements WindowManagerPolicy { switch (effectId) { case HapticFeedbackConstants.CONTEXT_CLICK: case HapticFeedbackConstants.GESTURE_END: + case HapticFeedbackConstants.GESTURE_THRESHOLD_ACTIVATE: case HapticFeedbackConstants.ROTARY_SCROLL_TICK: + case HapticFeedbackConstants.SEGMENT_TICK: return VibrationEffect.get(VibrationEffect.EFFECT_TICK); + case HapticFeedbackConstants.TEXT_HANDLE_MOVE: if (!mHapticTextHandleEnabled) { return null; } // fallthrough case HapticFeedbackConstants.CLOCK_TICK: + case HapticFeedbackConstants.SEGMENT_FREQUENT_TICK: return VibrationEffect.get(VibrationEffect.EFFECT_TEXTURE_TICK); + case HapticFeedbackConstants.KEYBOARD_RELEASE: case HapticFeedbackConstants.VIRTUAL_KEY_RELEASE: case HapticFeedbackConstants.ENTRY_BUMP: case HapticFeedbackConstants.DRAG_CROSSING: return VibrationEffect.get(VibrationEffect.EFFECT_TICK, false); + case HapticFeedbackConstants.KEYBOARD_TAP: // == KEYBOARD_PRESS case HapticFeedbackConstants.VIRTUAL_KEY: case HapticFeedbackConstants.EDGE_RELEASE: + case HapticFeedbackConstants.CALENDAR_DATE: case HapticFeedbackConstants.CONFIRM: case HapticFeedbackConstants.GESTURE_START: case HapticFeedbackConstants.ROTARY_SCROLL_ITEM_FOCUS: case HapticFeedbackConstants.ROTARY_SCROLL_LIMIT: return VibrationEffect.get(VibrationEffect.EFFECT_CLICK); + case HapticFeedbackConstants.LONG_PRESS: case HapticFeedbackConstants.LONG_PRESS_POWER_BUTTON: + case HapticFeedbackConstants.DRAG_START: case HapticFeedbackConstants.EDGE_SQUEEZE: return VibrationEffect.get(VibrationEffect.EFFECT_HEAVY_CLICK); + case HapticFeedbackConstants.REJECT: return VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK); - case HapticFeedbackConstants.CALENDAR_DATE: - return VibrationEffect.get(VibrationEffect.EFFECT_CLICK); case HapticFeedbackConstants.SAFE_MODE_ENABLED: pattern = mSafeModeEnabledVibePattern; break; case HapticFeedbackConstants.ASSISTANT_BUTTON: if (mVibrator.areAllPrimitivesSupported( - VibrationEffect.Composition.PRIMITIVE_QUICK_RISE)) { + VibrationEffect.Composition.PRIMITIVE_QUICK_RISE, + VibrationEffect.Composition.PRIMITIVE_TICK)) { // quiet ramp, short pause, then sharp tick return VibrationEffect.startComposition() .addPrimitive(VibrationEffect.Composition.PRIMITIVE_QUICK_RISE, 0.25f) @@ -5769,6 +5778,22 @@ public class PhoneWindowManager implements WindowManagerPolicy { // fallback for devices without composition support return VibrationEffect.get(VibrationEffect.EFFECT_HEAVY_CLICK); + case HapticFeedbackConstants.GESTURE_THRESHOLD_DEACTIVATE: + return getScaledPrimitiveOrElseEffect( + VibrationEffect.Composition.PRIMITIVE_TICK, 0.4f, + VibrationEffect.EFFECT_TEXTURE_TICK); + + case HapticFeedbackConstants.TOGGLE_ON: + return getScaledPrimitiveOrElseEffect( + VibrationEffect.Composition.PRIMITIVE_TICK, 0.5f, + VibrationEffect.EFFECT_TICK); + + case HapticFeedbackConstants.TOGGLE_OFF: + return getScaledPrimitiveOrElseEffect( + VibrationEffect.Composition.PRIMITIVE_LOW_TICK, 0.2f, + VibrationEffect.EFFECT_TEXTURE_TICK); + + case HapticFeedbackConstants.NO_HAPTICS: default: return null; } @@ -5784,6 +5809,17 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } + private VibrationEffect getScaledPrimitiveOrElseEffect(int primitiveId, float scale, + int elseEffectId) { + if (mVibrator.areAllPrimitivesSupported(primitiveId)) { + return VibrationEffect.startComposition() + .addPrimitive(primitiveId, scale) + .compose(); + } else { + return VibrationEffect.get(elseEffectId); + } + } + private VibrationAttributes getVibrationAttributes(int effectId) { switch (effectId) { case HapticFeedbackConstants.EDGE_SQUEEZE: