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

Commit c8bd45a8 authored by Lais Andrade's avatar Lais Andrade
Browse files

Hide API for combined sequential effects. 

Hide the introduced public API until we have more clarity on how
VibrationEffect.Composition will look like after changes related to PWLE
effects.

Bug: 167946760
Test: N/A
Change-Id: I152f8ac09c35d672b90e3ebcb2e1041f8f08efaf
parent f48c8fc6

core/api/current.txt

+0 −9
Original line number Diff line number Diff line
@@ -30763,19 +30763,10 @@ package android.os { 
  public abstract class CombinedVibrationEffect implements android.os.Parcelable {

    method @NonNull public static android.os.CombinedVibrationEffect createSynced(@NonNull android.os.VibrationEffect);

    method public int describeContents();

    method @NonNull public static android.os.CombinedVibrationEffect.SequentialCombination startSequential();

    method @NonNull public static android.os.CombinedVibrationEffect.SyncedCombination startSynced();

    field @NonNull public static final android.os.Parcelable.Creator<android.os.CombinedVibrationEffect> CREATOR;

  }













  public static final class CombinedVibrationEffect.SequentialCombination {













    method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(int, @NonNull android.os.VibrationEffect);













    method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(int, @NonNull android.os.VibrationEffect, int);













    method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(@NonNull android.os.CombinedVibrationEffect);













    method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(@NonNull android.os.CombinedVibrationEffect, int);













    method @NonNull public android.os.CombinedVibrationEffect combine();













  }



























  public static final class CombinedVibrationEffect.SyncedCombination {















    method @NonNull public android.os.CombinedVibrationEffect.SyncedCombination addVibrator(int, @NonNull android.os.VibrationEffect);















    method @NonNull public android.os.CombinedVibrationEffect combine();

























core/api/test-current.txt



+9
−0




























Original line number
Diff line number
Diff line








@@ -1371,6 +1371,7 @@ package android.os {





























  public abstract class CombinedVibrationEffect implements android.os.Parcelable {















    method public abstract long getDuration();













    method @NonNull public static android.os.CombinedVibrationEffect.SequentialCombination startSequential();















  }































  public static final class CombinedVibrationEffect.Mono extends android.os.CombinedVibrationEffect {









@@ -1388,6 +1389,14 @@ package android.os {













    field @NonNull public static final android.os.Parcelable.Creator<android.os.CombinedVibrationEffect.Sequential> CREATOR;















  }





























  public static final class CombinedVibrationEffect.SequentialCombination {













    method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(int, @NonNull android.os.VibrationEffect);













    method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(int, @NonNull android.os.VibrationEffect, int);













    method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(@NonNull android.os.CombinedVibrationEffect);













    method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(@NonNull android.os.CombinedVibrationEffect, int);













    method @NonNull public android.os.CombinedVibrationEffect combine();













  }





























  public static final class CombinedVibrationEffect.Stereo extends android.os.CombinedVibrationEffect {















    method public long getDuration();















    method @NonNull public android.util.SparseArray<android.os.VibrationEffect> getEffects();

































core/java/android/os/CombinedVibrationEffect.java



+4
−0




























Original line number
Diff line number
Diff line








@@ -76,7 +76,9 @@ public abstract class CombinedVibrationEffect implements Parcelable {













     * A sequential vibration effect should be performed by multiple vibrators in order.















     *















     * @see CombinedVibrationEffect.SequentialCombination













     * @hide















     */













    @TestApi















    @NonNull















    public static SequentialCombination startSequential() {















        return new SequentialCombination();










@@ -162,7 +164,9 @@ public abstract class CombinedVibrationEffect implements Parcelable {













     * A combination of haptic effects that should be played in multiple vibrators in sequence.















     *















     * @see CombinedVibrationEffect#startSequential()













     * @hide















     */













    @TestApi















    public static final class SequentialCombination {































        private final ArrayList<CombinedVibrationEffect> mEffects = new ArrayList<>();