Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide API for combined sequential effects." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-04 01:00:03 +00:00
committed by Android (Google) Code Review
parent 5de9c019aa c8bd45a817
commit 198c943d87
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/api/current.txt
View File

@@ -30431,19 +30431,10 @@ package android.os {
public abstract class CombinedVibrationEffect implements android.os.Parcelable { public abstract class CombinedVibrationEffect implements android.os.Parcelable {
method @NonNull public static android.os.CombinedVibrationEffect createSynced(@NonNull android.os.VibrationEffect); method @NonNull public static android.os.CombinedVibrationEffect createSynced(@NonNull android.os.VibrationEffect);
method public int describeContents(); method public int describeContents();
method @NonNull public static android.os.CombinedVibrationEffect.SequentialCombination startSequential();
method @NonNull public static android.os.CombinedVibrationEffect.SyncedCombination startSynced(); method @NonNull public static android.os.CombinedVibrationEffect.SyncedCombination startSynced();
field @NonNull public static final android.os.Parcelable.Creator<android.os.CombinedVibrationEffect> CREATOR; 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 { 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.SyncedCombination addVibrator(int, @NonNull android.os.VibrationEffect);
method @NonNull public android.os.CombinedVibrationEffect combine(); method @NonNull public android.os.CombinedVibrationEffect combine();

9
core/api/test-current.txt
View File

@@ -1489,6 +1489,7 @@ package android.os {
public abstract class CombinedVibrationEffect implements android.os.Parcelable { public abstract class CombinedVibrationEffect implements android.os.Parcelable {
method public abstract long getDuration(); method public abstract long getDuration();
method @NonNull public static android.os.CombinedVibrationEffect.SequentialCombination startSequential();
} }
public static final class CombinedVibrationEffect.Mono extends android.os.CombinedVibrationEffect { 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; 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 { public static final class CombinedVibrationEffect.Stereo extends android.os.CombinedVibrationEffect {
method public long getDuration(); method public long getDuration();
method @NonNull public android.util.SparseArray<android.os.VibrationEffect> getEffects(); method @NonNull public android.util.SparseArray<android.os.VibrationEffect> getEffects();

4
core/java/android/os/CombinedVibrationEffect.java
View File

@@ -76,7 +76,9 @@ public abstract class CombinedVibrationEffect implements Parcelable {
* A sequential vibration effect should be performed by multiple vibrators in order. * A sequential vibration effect should be performed by multiple vibrators in order.
* *
* @see CombinedVibrationEffect.SequentialCombination * @see CombinedVibrationEffect.SequentialCombination
* @hide
*/ */
@TestApi
@NonNull @NonNull
public static SequentialCombination startSequential() { public static SequentialCombination startSequential() {
return new SequentialCombination(); 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. * A combination of haptic effects that should be played in multiple vibrators in sequence.
* *
* @see CombinedVibrationEffect#startSequential() * @see CombinedVibrationEffect#startSequential()
* @hide
*/ */
@TestApi
public static final class SequentialCombination { public static final class SequentialCombination {
private final ArrayList<CombinedVibrationEffect> mEffects = new ArrayList<>(); private final ArrayList<CombinedVibrationEffect> mEffects = new ArrayList<>();