Merge "Make VibrationEffect.WaveformBuilder public" (2d67d495) · Commits · e / os / android_frameworks_base

core/api/current.txt

+21 −0

Original line number	Diff line number	Diff line
		@@ -31928,6 +31928,9 @@ package android.os {
		method public static android.os.VibrationEffect createWaveform(long[], int[], int);
		method public int describeContents();
		method @NonNull public static android.os.VibrationEffect.Composition startComposition();
		method @NonNull public static android.os.VibrationEffect.WaveformBuilder startWaveform();
		method @NonNull public static android.os.VibrationEffect.WaveformBuilder startWaveform(@NonNull android.os.VibrationEffect.VibrationParameter);
		method @NonNull public static android.os.VibrationEffect.WaveformBuilder startWaveform(@NonNull android.os.VibrationEffect.VibrationParameter, @NonNull android.os.VibrationEffect.VibrationParameter);
		field @NonNull public static final android.os.Parcelable.Creator<android.os.VibrationEffect> CREATOR;
		field public static final int DEFAULT_AMPLITUDE = -1; // 0xffffffff
		field public static final int EFFECT_CLICK = 0; // 0x0
		@@ -31937,10 +31940,13 @@ package android.os {
		}

		public static final class VibrationEffect.Composition {
		method @NonNull public android.os.VibrationEffect.Composition addEffect(@NonNull android.os.VibrationEffect);
		method @NonNull public android.os.VibrationEffect.Composition addOffDuration(@NonNull java.time.Duration);
		method @NonNull public android.os.VibrationEffect.Composition addPrimitive(int);
		method @NonNull public android.os.VibrationEffect.Composition addPrimitive(int, @FloatRange(from=0.0f, to=1.0f) float);
		method @NonNull public android.os.VibrationEffect.Composition addPrimitive(int, @FloatRange(from=0.0f, to=1.0f) float, @IntRange(from=0) int);
		method @NonNull public android.os.VibrationEffect compose();
		method @NonNull public android.os.VibrationEffect.Composition repeatEffectIndefinitely(@NonNull android.os.VibrationEffect);
		field public static final int PRIMITIVE_CLICK = 1; // 0x1
		field public static final int PRIMITIVE_LOW_TICK = 8; // 0x8
		field public static final int PRIMITIVE_QUICK_FALL = 6; // 0x6
		@@ -31951,6 +31957,21 @@ package android.os {
		field public static final int PRIMITIVE_TICK = 7; // 0x7
		}

		public static final class VibrationEffect.Composition.UnreachableAfterRepeatingIndefinitelyException extends java.lang.IllegalStateException {
		}

		public static class VibrationEffect.VibrationParameter {
		method @NonNull public static android.os.VibrationEffect.VibrationParameter targetAmplitude(@FloatRange(from=0, to=1) float);
		method @NonNull public static android.os.VibrationEffect.VibrationParameter targetFrequency(@FloatRange(from=1) float);
		}

		public static final class VibrationEffect.WaveformBuilder {
		method @NonNull public android.os.VibrationEffect.WaveformBuilder addSustain(@NonNull java.time.Duration);
		method @NonNull public android.os.VibrationEffect.WaveformBuilder addTransition(@NonNull java.time.Duration, @NonNull android.os.VibrationEffect.VibrationParameter);
		method @NonNull public android.os.VibrationEffect.WaveformBuilder addTransition(@NonNull java.time.Duration, @NonNull android.os.VibrationEffect.VibrationParameter, @NonNull android.os.VibrationEffect.VibrationParameter);
		method @NonNull public android.os.VibrationEffect build();
		}

		public abstract class Vibrator {
		method public final int areAllEffectsSupported(@NonNull int...);
		method public final boolean areAllPrimitivesSupported(@NonNull int...);

core/api/test-current.txt

+0 −15

Original line number	Diff line number	Diff line
		@@ -1793,7 +1793,6 @@ package android.os {
		method public static android.os.VibrationEffect get(int, boolean);
		method @Nullable public static android.os.VibrationEffect get(android.net.Uri, android.content.Context);
		method public abstract long getDuration();
		method @NonNull public static android.os.VibrationEffect.WaveformBuilder startWaveform();
		field public static final int EFFECT_POP = 4; // 0x4
		field public static final int EFFECT_STRENGTH_LIGHT = 0; // 0x0
		field public static final int EFFECT_STRENGTH_MEDIUM = 1; // 0x1
		@@ -1811,20 +1810,6 @@ package android.os {
		field @NonNull public static final android.os.Parcelable.Creator<android.os.VibrationEffect.Composed> CREATOR;
		}

		public static final class VibrationEffect.Composition {
		method @NonNull public android.os.VibrationEffect.Composition addEffect(@NonNull android.os.VibrationEffect);
		method @NonNull public android.os.VibrationEffect.Composition addEffect(@NonNull android.os.VibrationEffect, @IntRange(from=0) int);
		}

		public static final class VibrationEffect.WaveformBuilder {
		method @NonNull public android.os.VibrationEffect.WaveformBuilder addRamp(@FloatRange(from=0.0f, to=1.0f) float, @IntRange(from=0) int);
		method @NonNull public android.os.VibrationEffect.WaveformBuilder addRamp(@FloatRange(from=0.0f, to=1.0f) float, @FloatRange(from=1.0f) float, @IntRange(from=0) int);
		method @NonNull public android.os.VibrationEffect.WaveformBuilder addStep(@FloatRange(from=0.0f, to=1.0f) float, @IntRange(from=0) int);
		method @NonNull public android.os.VibrationEffect.WaveformBuilder addStep(@FloatRange(from=0.0f, to=1.0f) float, @FloatRange(from=1.0f) float, @IntRange(from=0) int);
		method @NonNull public android.os.VibrationEffect build();
		method @NonNull public android.os.VibrationEffect build(int);
		}

		public abstract class Vibrator {
		method public int getDefaultVibrationIntensity(int);
		field public static final int VIBRATION_INTENSITY_HIGH = 3; // 0x3