Merge "Add call volume in sound settings" into pi-dev am: b46389a588

am: 71b333f162

Change-Id: If69203fa5c4158f609484e6c3bbc0ca5bd6e0f58
This commit is contained in:
Ryan Lin
2018-05-11 15:44:53 -07:00
committed by android-build-merger
10 changed files with 219 additions and 19 deletions

View File

@@ -83,7 +83,9 @@ public class VolumeSeekBarPreference extends SeekBarPreference {
public void setStream(int stream) {
mStream = stream;
setMax(mAudioManager.getStreamMaxVolume(mStream));
setMin(mAudioManager.getStreamMinVolume(mStream));
// Use getStreamMinVolumeInt for non-public stream type
// eg: AudioManager.STREAM_BLUETOOTH_SCO
setMin(mAudioManager.getStreamMinVolumeInt(mStream));
setProgress(mAudioManager.getStreamVolume(mStream));
}
@@ -108,10 +110,6 @@ public class VolumeSeekBarPreference extends SeekBarPreference {
@Override
public void onBindViewHolder(PreferenceViewHolder view) {
super.onBindViewHolder(view);
if (mStream == 0) {
Log.w(TAG, "No stream found, not binding volumizer");
return;
}
mSeekBar = (SeekBar) view.findViewById(com.android.internal.R.id.seekbar);
mIconView = (ImageView) view.findViewById(com.android.internal.R.id.icon);
mSuppressionTextView = (TextView) view.findViewById(R.id.suppression_text);