Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a11e2bb6 authored by Lais Andrade's avatar Lais Andrade Committed by Automerger Merge Worker
Browse files

Merge "Clarify delay parameter documentation in VibrationEffect" am:... 

Merge "Clarify delay parameter documentation in VibrationEffect" am: 2b9f0c76 am: cdbc51fa am: 3afe20a3 am: 9080ab7c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63bf2e92ceac70cabc9feefef1894d068ea68a89
parents d3022e11 9080ab7c

core/java/android/os/VibrationEffect.java

+2 −1
Original line number Diff line number Diff line
@@ -1208,7 +1208,8 @@ 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 before playing this primitive

         * @param delay The amount of time in milliseconds to wait before playing this primitive,

         *              starting at the time the previous element in this composition is finished.

         * @return The {@link Composition} object to enable adding multiple primitives in one chain.

         */

        @NonNull