summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lais Andrade <lsandrade@google.com> 2020-12-01 00:05:59 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-12-01 00:05:59 +0000
commitd95f42a4ee3f3bf68b74edf69f4d89c61129d17a (patch)
tree43001d7a7e24f808de10744397ad19b227ad34d4
parent9f4e8b8830bd3e784eb60d92ec53a10034fea46a (diff)
parent040919bef59e999584cea8cac358aee7e0aaa901 (diff)
Merge "Fix documentation of delay param in VibrationEffect.Composition" am: 040919bef5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513870 Change-Id: I2c9eba34a9d9086f216445724e10bb0c04c356c1
-rw-r--r--core/java/android/os/VibrationEffect.java3
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