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

Merge "[Output Switcher] Add unmute function on volume icon" into udc-dev

Browse Source
This commit is contained in:
Shaowei Shen
2023-03-31 13:35:26 +00:00
committed by Android (Google) Code Review
parent 7c0ec9373b 4b2a96ee15
commit 528dfcfe70
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,8 @@ public abstract class MediaOutputBaseAdapter extends
protected final MediaOutputController mController;
private static final int UNMUTE_DEFAULT_VOLUME = 2;
Context mContext;
View mHolderView;
boolean mIsDragging;
@@ -193,10 +195,6 @@ public abstract class MediaOutputBaseAdapter extends
mTwoLineTitleText.setTextColor(mController.getColorItemContent());
if (mController.isAdvancedLayoutSupported()) {
mVolumeValueText.setTextColor(mController.getColorItemContent());
mTitleIcon.setOnTouchListener(((v, event) -> {
mSeekBar.dispatchTouchEvent(event);
return false;
}));
}
mSeekBar.setProgressTintList(
ColorStateList.valueOf(mController.getColorSeekbarProgress()));
@@ -546,13 +544,21 @@ public abstract class MediaOutputBaseAdapter extends
private void enableSeekBar(MediaDevice device) {
mSeekBar.setEnabled(true);
mSeekBar.setOnTouchListener((v, event) -> false);
if (mController.isAdvancedLayoutSupported()) {
updateIconAreaClickListener((v) -> {
updateIconAreaClickListener((v) -> {
if (device.getCurrentVolume() == 0) {
mController.adjustVolume(device, UNMUTE_DEFAULT_VOLUME);
updateUnmutedVolumeIcon();
mTitleIcon.setOnTouchListener(((iconV, event) -> false));
} else {
mSeekBar.resetVolume();
mController.adjustVolume(device, 0);
updateMutedVolumeIcon();
});
}
mTitleIcon.setOnTouchListener(((iconV, event) -> {
mSeekBar.dispatchTouchEvent(event);
return false;
}));
}
});
}
protected void setUpDeviceIcon(MediaDevice device) {