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

Merge "VolumeShaper: update API, use "Millis" instead of "Ms"" into oc-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi
2017-04-12 15:45:49 +00:00
committed by Android (Google) Code Review
parent 56069d7146 0dfbd1569d
commit 170e3e242b
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -23620,7 +23620,7 @@ package android.media {
public static final class VolumeShaper.Configuration implements android.os.Parcelable {
method public int describeContents();
method public double getDurationMs();
method public double getDurationMillis();
method public int getInterpolatorType();
method public static int getMaximumCurvePoints();
method public float[] getTimes();
@@ -23646,7 +23646,7 @@ package android.media {
method public android.media.VolumeShaper.Configuration.Builder scaleToEndVolume(float);
method public android.media.VolumeShaper.Configuration.Builder scaleToStartVolume(float);
method public android.media.VolumeShaper.Configuration.Builder setCurve(float[], float[]);
method public android.media.VolumeShaper.Configuration.Builder setDurationMs(double);
method public android.media.VolumeShaper.Configuration.Builder setDurationMillis(double);
method public android.media.VolumeShaper.Configuration.Builder setInterpolatorType(int);
}

4
api/system-current.txt
View File

@@ -25457,7 +25457,7 @@ package android.media {
public static final class VolumeShaper.Configuration implements android.os.Parcelable {
method public int describeContents();
method public double getDurationMs();
method public double getDurationMillis();
method public int getInterpolatorType();
method public static int getMaximumCurvePoints();
method public float[] getTimes();
@@ -25483,7 +25483,7 @@ package android.media {
method public android.media.VolumeShaper.Configuration.Builder scaleToEndVolume(float);
method public android.media.VolumeShaper.Configuration.Builder scaleToStartVolume(float);
method public android.media.VolumeShaper.Configuration.Builder setCurve(float[], float[]);
method public android.media.VolumeShaper.Configuration.Builder setDurationMs(double);
method public android.media.VolumeShaper.Configuration.Builder setDurationMillis(double);
method public android.media.VolumeShaper.Configuration.Builder setInterpolatorType(int);
}

4
api/test-current.txt
View File

@@ -23733,7 +23733,7 @@ package android.media {
public static final class VolumeShaper.Configuration implements android.os.Parcelable {
method public int describeContents();
method public double getDurationMs();
method public double getDurationMillis();
method public int getInterpolatorType();
method public static int getMaximumCurvePoints();
method public float[] getTimes();
@@ -23759,7 +23759,7 @@ package android.media {
method public android.media.VolumeShaper.Configuration.Builder scaleToEndVolume(float);
method public android.media.VolumeShaper.Configuration.Builder scaleToStartVolume(float);
method public android.media.VolumeShaper.Configuration.Builder setCurve(float[], float[]);
method public android.media.VolumeShaper.Configuration.Builder setDurationMs(double);
method public android.media.VolumeShaper.Configuration.Builder setDurationMillis(double);
method public android.media.VolumeShaper.Configuration.Builder setInterpolatorType(int);
}

28
media/java/android/media/VolumeShaper.java
View File

@@ -301,7 +301,7 @@ public final class VolumeShaper implements AutoCloseable {
.setInterpolatorType(INTERPOLATOR_TYPE_LINEAR)
.setCurve(new float[] {0.f, 1.f} /* times */,
new float[] {0.f, 1.f} /* volumes */)
.setDurationMs(1000.)
.setDurationMillis(1000.)
.build();
/**
@@ -314,7 +314,7 @@ public final class VolumeShaper implements AutoCloseable {
.setInterpolatorType(INTERPOLATOR_TYPE_CUBIC)
.setCurve(new float[] {0.f, 1.f} /* times */,
new float[] {0.f, 1.f} /* volumes */)
.setDurationMs(1000.)
.setDurationMillis(1000.)
.build();
/**
@@ -348,12 +348,12 @@ public final class VolumeShaper implements AutoCloseable {
SINE_RAMP = new VolumeShaper.Configuration.Builder()
.setInterpolatorType(INTERPOLATOR_TYPE_CUBIC)
.setCurve(times, sines)
.setDurationMs(1000.)
.setDurationMillis(1000.)
.build();
SCURVE_RAMP = new VolumeShaper.Configuration.Builder()
.setInterpolatorType(INTERPOLATOR_TYPE_CUBIC)
.setCurve(times, scurve)
.setDurationMs(1000.)
.setDurationMillis(1000.)
.build();
}
@@ -569,7 +569,7 @@ public final class VolumeShaper implements AutoCloseable {
/**
* Returns the duration of the volume shape in milliseconds.
*/
public double getDurationMs() {
public double getDurationMillis() {
return mDurationMs;
}
@@ -700,7 +700,7 @@ public final class VolumeShaper implements AutoCloseable {
* .setInterpolatorType(VolumeShaper.Configuration.INTERPOLATOR_TYPE_LINEAR)
* .setCurve(new float[] { 0.f, 1.f }, // times
* new float[] { 0.f, 1.f }) // volumes
* .setDurationMs(1000.)
* .setDurationMillis(1000.)
* .build();
* </pre>
* <p>
@@ -731,7 +731,7 @@ public final class VolumeShaper implements AutoCloseable {
mId = configuration.getId();
mOptionFlags = configuration.getAllOptionFlags();
mInterpolatorType = configuration.getInterpolatorType();
mDurationMs = configuration.getDurationMs();
mDurationMs = configuration.getDurationMillis();
mTimes = configuration.getTimes().clone();
mVolumes = configuration.getVolumes().clone();
}
@@ -805,17 +805,17 @@ public final class VolumeShaper implements AutoCloseable {
*
* If omitted, the default duration is 1 second.
*
* @param durationMs
* @param durationMillis
* @return the same {@code Builder} instance.
* @throws IllegalArgumentException if {@code durationMs}
* @throws IllegalArgumentException if {@code durationMillis}
* is not strictly positive.
*/
public @NonNull Builder setDurationMs(double durationMs) {
if (durationMs <= 0.) {
public @NonNull Builder setDurationMillis(double durationMillis) {
if (durationMillis <= 0.) {
throw new IllegalArgumentException(
"duration: " + durationMs + " not positive");
"duration: " + durationMillis + " not positive");
}
mDurationMs = durationMs;
mDurationMs = durationMillis;
return this;
}
@@ -833,7 +833,7 @@ public final class VolumeShaper implements AutoCloseable {
* time (x) coordinates should be monotonically increasing, from 0.f to 1.f;
* volume (y) coordinates must be within 0.f to 1.f.
* <p>
* The time scale is set by {@link #setDurationMs}.
* The time scale is set by {@link #setDurationMillis}.
* <p>
* @param times an array of float values representing
* the time line of the volume curve.

2
services/core/java/com/android/server/audio/PlaybackActivityMonitor.java
View File

@@ -57,7 +57,7 @@ public final class PlaybackActivityMonitor
.setCurve(new float[] { 0.f, 1.f } /* times */,
new float[] { 1.f, 0.2f } /* volumes */)
.setOptionFlags(VolumeShaper.Configuration.OPTION_FLAG_CLOCK_TIME)
.setDurationMs(MediaFocusControl.getFocusRampTimeMs(
.setDurationMillis(MediaFocusControl.getFocusRampTimeMs(
AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK,
new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION)
.build()))