Merge "Change default stream volume for TV to 1/4 max instead of 3/4"

This commit is contained in:
Takayuki Hoshi
2016-07-28 06:16:21 +00:00
committed by Android (Google) Code Review

View File

@@ -630,7 +630,11 @@ public class AudioService extends IAudioService.Stub {
MAX_STREAM_VOLUME[AudioSystem.STREAM_MUSIC]);
if (maxVolume != MAX_STREAM_VOLUME[AudioSystem.STREAM_MUSIC]) {
MAX_STREAM_VOLUME[AudioSystem.STREAM_MUSIC] = maxVolume;
AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_MUSIC] = (maxVolume * 3) / 4;
if (isPlatformTelevision()) {
AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_MUSIC] = maxVolume / 4;
} else {
AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_MUSIC] = (maxVolume * 3) / 4;
}
}
sSoundEffectVolumeDb = context.getResources().getInteger(