Merge "Fix documentation of delay param in VibrationEffect.Composition" am: 040919bef5 am: d95f42a4ee am: 8c54f99eba

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513870

Change-Id: I8f5eb7cbf2aca09f05d8c29f674058a3c510c91f
This commit is contained in:
Lais Andrade
2020-12-01 01:18:47 +00:00
committed by Automerger Merge Worker

View File

@@ -1138,8 +1138,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