Merge "Hide API for combined sequential effects." into sc-dev (198c943d) · Commits · e / os / android_frameworks_base

core/api/current.txt

+0 −9

Original line number	Diff line number	Diff line
		@@ -30431,19 +30431,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
		@@ -1489,6 +1489,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 {
		@@ -1506,6 +1507,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<>();