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

Merge "[Output Switcher] Improve volume control" into udc-qpr-dev

Browse Source
This commit is contained in:
Shaowei Shen
2023-08-09 03:50:32 +00:00
committed by Android (Google) Code Review
parent 2e96ec4c85 129a648345
commit bc8c625b65
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java
View File

@@ -157,6 +157,7 @@ public abstract class MediaOutputBaseAdapter extends
private String mDeviceId;
private ValueAnimator mCornerAnimator;
private ValueAnimator mVolumeAnimator;
private int mLatestUpdateVolume = -1;
MediaDeviceBaseViewHolder(View view) {
super(view);
@@ -314,7 +315,11 @@ public abstract class MediaOutputBaseAdapter extends
mSeekBar.setMaxVolume(device.getMaxVolume());
final int currentVolume = device.getCurrentVolume();
if (!mIsDragging) {
if (mSeekBar.getVolume() != currentVolume) {
if (mSeekBar.getVolume() != currentVolume && (mLatestUpdateVolume == -1
|| currentVolume == mLatestUpdateVolume)) {
// Update only if volume of device and value of volume bar doesn't match.
// Check if response volume match with the latest request, to ignore obsolete
// response
if (isCurrentSeekbarInvisible && !mIsInitVolumeFirstTime) {
updateTitleIcon(currentVolume == 0 ? R.drawable.media_output_icon_volume_off
: R.drawable.media_output_icon_volume,
@@ -330,12 +335,16 @@ public abstract class MediaOutputBaseAdapter extends
updateUnmutedVolumeIcon();
}
mSeekBar.setVolume(currentVolume);
mLatestUpdateVolume = -1;
}
}
} else if (currentVolume == 0) {
mSeekBar.resetVolume();
updateMutedVolumeIcon();
}
if (currentVolume == mLatestUpdateVolume) {
mLatestUpdateVolume = -1;
}
}
if (mIsInitVolumeFirstTime) {
mIsInitVolumeFirstTime = false;
@@ -360,6 +369,7 @@ public abstract class MediaOutputBaseAdapter extends
mStartFromMute = false;
}
if (progressToVolume != deviceVolume) {
mLatestUpdateVolume = progressToVolume;
mController.adjustVolume(device, progressToVolume);
}
}