diff options
| author | 2020-12-01 01:02:24 +0000 | |
|---|---|---|
| committer | 2020-12-01 01:02:24 +0000 | |
| commit | 8c54f99eba13ac63d7486c1e5b03214ba69087e2 (patch) | |
| tree | c8cc1c94dbd8a6c141be3a1ff386ab78dd4dcc5f | |
| parent | 7afb6a13996765902a547b974a45d8afa21cb3aa (diff) | |
| parent | d95f42a4ee3f3bf68b74edf69f4d89c61129d17a (diff) | |
Merge "Fix documentation of delay param in VibrationEffect.Composition" am: 040919bef5 am: d95f42a4ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513870
Change-Id: Ia7dfebf9187054eccb3ca9a2309a94ac674995f7
| -rw-r--r-- | core/java/android/os/VibrationEffect.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/os/VibrationEffect.java b/core/java/android/os/VibrationEffect.java index 8be4bfde2fa6..769a34eed1dc 100644 --- a/core/java/android/os/VibrationEffect.java +++ b/core/java/android/os/VibrationEffect.java @@ -1083,8 +1083,7 @@ public abstract class VibrationEffect implements Parcelable { * * @param primitiveId The primitive to add * @param scale The scale to apply to the intensity of the primitive. - * @param delay The amount of time, in milliseconds, to wait between playing the prior - * primitive and this one + * @param delay The amount of time in milliseconds to wait before playing this primitive * @return The {@link Composition} object to enable adding multiple primitives in one chain. */ @NonNull |