PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Audiosharing] Fix volume control.

Browse Source 
1. Unregister the volume control callbacks in onDestroy
2. Reuse SeekBarPreference#setProgress
3. Fetch volume from AudioManager if got invalid volume from VC service.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: manual
Change-Id: Id63d1dbff4c3cbdeb91c2537d951c39e1a932220
This commit is contained in:
Yiyi Shen
2023-12-04 16:05:28 +08:00
parent 6e3bf1ee10
commit afbd9d9894
3 changed files with 60 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumePreference.java
View File

@@ -21,33 +21,23 @@ import android.widget.SeekBar;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
import com.android.settings.bluetooth.Utils;
import com.android.settings.widget.SeekBarPreference;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
public class AudioSharingDeviceVolumePreference extends SeekBarPreference {
private static final String TAG = "AudioSharingDeviceVolumePreference";
public static final int MIN_VOLUME = 0;
public static final int MAX_VOLUME = 255;
protected SeekBar mSeekBar;
private final LocalBluetoothManager mLocalBtManager;
private final CachedBluetoothDevice mCachedDevice;
private final SeekBar.OnSeekBarChangeListener mListener;
public AudioSharingDeviceVolumePreference(
Context context,
@NonNull CachedBluetoothDevice device,
SeekBar.OnSeekBarChangeListener listener) {
Context context, @NonNull CachedBluetoothDevice device) {
super(context);
setLayoutResource(R.layout.preference_volume_slider);
mLocalBtManager = Utils.getLocalBtManager(context);
mCachedDevice = device;
mListener = listener;
}
@Nullable
@@ -55,19 +45,12 @@ public class AudioSharingDeviceVolumePreference extends SeekBarPreference {
return mCachedDevice;
}
@Override
public void onBindViewHolder(PreferenceViewHolder view) {
super.onBindViewHolder(view);
mSeekBar = (SeekBar) view.findViewById(com.android.internal.R.id.seekbar);
mSeekBar.setMax(MAX_VOLUME);
mSeekBar.setMin(MIN_VOLUME);
mSeekBar.setOnSeekBarChangeListener(mListener);
}
/** Set the progress bar to target progress */
public void setProgress(int progress) {
if (mSeekBar != null) {
mSeekBar.setProgress(progress);
}
/**
* Initialize {@link AudioSharingDeviceVolumePreference}.
* Need to be called after creating the preference.
*/
public void initialize() {
setMax(MAX_VOLUME);
setMin(MIN_VOLUME);
}
}