diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/VibrationEffect.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/core/java/android/os/VibrationEffect.java b/core/java/android/os/VibrationEffect.java index 2d218f4f2541..1992f1dc911e 100644 --- a/core/java/android/os/VibrationEffect.java +++ b/core/java/android/os/VibrationEffect.java @@ -963,7 +963,7 @@ public abstract class VibrationEffect implements Parcelable { PRIMITIVE_QUICK_RISE, PRIMITIVE_SLOW_RISE, PRIMITIVE_QUICK_FALL, - PRIMITIVE_LIGHT_TICK, + PRIMITIVE_TICK, }) @Retention(RetentionPolicy.SOURCE) public @interface Primitive {} @@ -981,10 +981,14 @@ public abstract class VibrationEffect implements Parcelable { * A haptic effect that simulates downwards movement with gravity. Often * followed by extra energy of hitting and reverberation to augment * physicality. + * + * @hide Not confident enough to expose publicly yet */ public static final int PRIMITIVE_THUD = 2; /** * A haptic effect that simulates spinning momentum. + * + * @hide Not confident enough to expose publicly yet */ public static final int PRIMITIVE_SPIN = 3; /** @@ -1003,7 +1007,8 @@ public abstract class VibrationEffect implements Parcelable { * This very short effect should produce a light crisp sensation intended * to be used repetitively for dynamic feedback. */ - public static final int PRIMITIVE_LIGHT_TICK = 7; + // Internally this maps to the HAL constant CompositePrimitive::LIGHT_TICK + public static final int PRIMITIVE_TICK = 7; private ArrayList<PrimitiveEffect> mEffects = new ArrayList<>(); @@ -1081,7 +1086,7 @@ public abstract class VibrationEffect implements Parcelable { * */ static int checkPrimitive(int primitiveId) { - Preconditions.checkArgumentInRange(primitiveId, PRIMITIVE_NOOP, PRIMITIVE_LIGHT_TICK, + Preconditions.checkArgumentInRange(primitiveId, PRIMITIVE_NOOP, PRIMITIVE_TICK, "primitiveId"); return primitiveId; } @@ -1108,8 +1113,8 @@ public abstract class VibrationEffect implements Parcelable { return "PRIMITIVE_SLOW_RISE"; case PRIMITIVE_QUICK_FALL: return "PRIMITIVE_QUICK_FALL"; - case PRIMITIVE_LIGHT_TICK: - return "PRIMITIVE_LIGHT_TICK"; + case PRIMITIVE_TICK: + return "PRIMITIVE_TICK"; default: return Integer.toString(id); |